fix timestamp and tokenize