Fix loadout issues

This PR contains many fixes and features for zone loadouts.