Added proper times
Merged and fixed wattballscheduler