edits here and there