cosmetic fixes, fixed settings maintaining