Lift control

add lift control, also clean up a little