various definition edits