fixed setting saving and removed boilerplate