fixed typos, locale prep, code cleanup