Fixed counters

Fixed the card counters, started adding poison counters, and made some
of the code a little nicer.