little more work, cleaned/unified edge thms