bunch more edits