Updated deck cont

Makes requested fixes