changes from comments

James Kneerequested to merge
fixesFromComments into master

added all of the fixes you mentioned in the comments

Merge request reports