Tweaks and fixes to week 1
Merge pull request #6 from poiru/master

Language tweaks and fixes