per pull request review, updating comments and correcting conditionals