fixing settings, and also prior to lint run