a few small fixes
Merge branch 'master' of github.com:snowch/devcloud