minor comments throughout
Merge branch 'master' of ssh://github.com/j105rob/scram