edits and consistency changes