Tweak and tidy up settings