Did some work on settings