Minor improvements to add pitch modal.