* Fix Multiple Issues With Timestamps * simplify * improve parsing of timestamps Co-authored-by: PabstMirror <pabstmirror@gmail.com>