Yomp for Zhi: Version 1.18

I made some changes that should actually fix the locale issue stated in V1.17. I didn't know until months later that the previous 'fix' didn't actually work.