localization updates, other small fixes from latest 1.2
quick style fix from localization changes
Merge pull request #20 from protherj/pre-cg-fixes

Pre cg fixes