edits for feedback from BCP
more edits from BCP