More edits, numbered comments for easier tracking