more edits and stuff