bug fixes that may or may not have been required
Merge branch 'master' of github.com:/ajdlinux/govhack2014