a few more edits...