Several enhancements to deck