Fixes regarding lift_up, still a few things TODO in the file,