reincorporate improvements from MFPS paper, and work a bit on lifting proof