fixed some data issues, added equipmenttrader