misc fixes
Merge branch 'master' of https://github.com/maxenko/pindap