bug fixes; adjusting for new Schedule.cpp