More auto changes
More auto work and bug fixes