added cards from trade with mflore + some cleanup