Fix deleting tolerance issues
Merge pull request #1146 from ahomatthew/develop

Fix deleting tolerance issues and highlighted cells with data for tolerances