Second draft edits

Do not merge yet.