many small tweaks to autoschedule better