More edits and cites, etc.