Tidy up settings and add some additional ones