Incomplete - Schedule fixes

Creating this ticket to aggregate the recent schedule changes & outline remaining to-dos.