Old localization fixes

Fixes old localization issues and bad spaces (do a bad merge)