Misc language fixes
Merge pull request #149 from kenchris/langfix

Misc language fixes