Edits in response to BBG first comments