Rework week schedules and clean up a few others