Some small language improvements

Thanks to @skierpage 
(the fixes, not the problems :D )