I18n flaws

Fixes some possible injection bugs for internationalized strings & some minor cleanup.