localization fixes, style fixes
Merge pull request #662 from protherj/refactoring-and-fixes

Fixes for localization and order styles