Added additional "Time" improvements, bug fix where a return wouldn't actually return in theory.
Major improvements and changes.