lambda
bug fixes