Prepay token contains timestamp, few other fixes.