small changes
refactored auto some more