cleaned up easy cases of type-preservation proof, started lambda case (it's a mess)