add timestamp and improve parsers