fixed bugs and character cards
Merge branch 'fixingCards'