Added comments to reviewers and a couple minor code edits