Small style and error fixes
Merge branch 'master' of github.com:svenstaro/flamejam