Made a few changes to settings and db