edits, cleanup etc