Tested edits with explantory comments