add support for detecting timestamp
fixed support for timestamps not actually working