More fixes
Merge pull request #15 from jensjorritsma/More_card_fixes

More card fixes