fixed settings bugs