Made several improvements to the way unit's weapons are handled.