added more combinators to parser