More edits and such