Settings cleanup / some warnings / some bugs