Cleaned up card selection bugs