Fixed various issues with the scheduler and added current time marker