get majority of tests passing; fix small translation errors in combinators