Various bug fixes
Merge branch 'master' of github.com:sparks/genarthack