#712: More edits+cleanup