Cleanup, settings.xml support, better DPS approx.