first pass

some editorial issues remain, even before updates are applied