Lots of stuff

I should have committed earlier
Merge branch 'master' of https://github.com/AaronPerl/OpenHand