edited fixup w/additional comments