Many updates; in the refactor towards a jison based parser