cleanup and fixes
Merge branch 'master' of https://github.com/Gadreel/javam