a few more edits from BCP