Mike's fixes
Merge branch 'master' of https://github.com/mcmouse/handw

This merge brings our versions up to date