autodraw improvements