Some bug fixes + hacks.
Merge branch 'master' of github.com:ttblue/human_demos