improvements to autoscaling