cleanup + fix settings