added and tested more cards
merged and fixed bug with file loading