This adds a few new settings, mostly debug settings, cleans up some warnings, etc