Refined parser, added clocks