better settings
some cleanup