added some more combinators & fixed variable lookup (lexical scope)