lambda and parsing bugfixes