bug fixes and minor style improvements
Merge branch 'master' of https://github.com/ChrisCalderon/hiddencraft