misc fixes
Merge branch 'master' of https://github.com/petekp/petekp-v3