some more edits...