updated comments matching ezra's suggestions