Fixed autos....kind of
Cleaned up autos