some edits as I reread