Some edits and moves