improve parsers, add clocks