fixes #6599

also small improvements to the loadout system
alternative for #6607