Added some conventions, cleaned up some disgusting errors
Merge branch 'master' of https://github.com/dimitdim/ZAWDIW