A few more improvements. Still need to do more work to the stop schedule.