changes to schedule and partial solutions to #4