cleanup
add some fixmes for lambda body evaluation