Settings basics and cleaning up a bit