More edits.  Grrr, taking so long.