major edits on everything