minor code fixes.
Merge branch 'master' of ssh://git@github.com/sproctor/warlock2.git