Added drag to loadout and cleaned up earlier code.

I'm a lot more comfortable with these changes than the first - still not
perfect code, but I feel like things are a little close to their proper
place.