Correcting logic issue noted by Nick Powers, re-implemented (still ugly) localization fix from Day1 fixes