Added more cards and other fixes