additional improvements to errorgrab
Merge branch 'develop'