Updated the settings and fixed some deprecations