a few more edits here
and a few more