equipment handling fixes
equipment fixes; serialization bug fix