Retrofit v2 improvements to the clean configs

Performed by doing a full comparison of the v2 and v3 configs as they stood.

THIS HAS TRASHED ALL EXISTING TEST WORLDS, WHILST MAKING THE PACK MORE COMPATIBLE WITH 2.* WORLDS.