more rearranging, more text edits
deletes mostly