Cards correction. Trading works! Other fixes