fix macros
fix multiple values
lambda forms
minor interface changes