Changes to cards, added TODOs, added notion of discard for deck management

Minor changes and clean up.