Merge pull request #68 from sfuhrm/more-locale-fixes

More locale fixes
Merge pull request #69 from sfuhrm/code-cleanups-2

Code cleanups 2