Fixed how time is parsed and stored.
Fixed merge error on scheduler.py