Language cleanup and a few typos

Sounds perfect! 

If you could make that change (and possibly squash everything into one commit), I'll merge right away.

Thanks again!!