continuations, parsing improvements