Fixed oops where I overwrote the persistent state subst results. :(
Fixed oops of timestamp not returning the time.