some fixes to powertools
Merge branch 'master' of github.com:cj/powertools