Lots of bug fixes. Started upgrades to equipment cards.