Add settings and tidy up strings