a bunch of new edits