Updates to settings and db