a few touch ups
added a comment
merge conflicts
Merge branch 'paninapress-touchups'