mostly confirming BS edits; just a few notes remaining