Some small language improvements

Thanks to @skierpage 
(the fixes, not the problems :D )

<!---
@huboard:{"order":176.953125,"milestone_order":220,"custom_state":""}
-->