Refactor how gold cards are modelled, add remaining cards, fix typos