random changes
Merge pull request #58 from barmstro/random-changes

Fix several issues in wat-wat