Replaced spitdontswallow with the old tank fight spitter plugin since spitdontswallow is broken, some other minor organisation tweaks