Tweaked other AUTO programs