Some tidying up, also improvements to deck builder