Iss 22

Improvements to parser, timeline.