Fixed CardData equality, Other minor edits

Version Pre-Alpha 0.6.8