Fixes & tweaks for language
Merge pull request #2 from fatalbanana/master

Fixes & tweaks for language