Work on settings a little