some random fixes
Merge branch 'master' of https://github.com/trevstanhope/hive-node