Language updates

A few language and style fixes.
Merge pull request #19 from simenfur/patch-1

Language updates