changed some class names; added new Card methods