More edits. About done now.