fixed up settings a bit more