combat fix, settings fragment fix, cleanup