fixing some bugs in the combinators