Fixed settings a bit