Minor comments

Contains Justin's suggested changes from issue #1