Small tweaks and TODOs.
Merge branch 'master' of https://github.com/markchil/profiletools