bunch of wholesale edits