address comments

John's comments