making changes and adding comments relating to #1