Some improvements to the deck