several fixes to deck