comments and tweaking
Merge branch 'master' of https://github.com/traone/random-stuff