fixes to simplified combinators