Fix parse-timestamp, add time-from-now