Merge pull request #1152 from ahomatthew/develop

Fix for tolerance table and couple other small fixes
Merge pull request #1153 from ahomatthew/develop

Fix N Tolerance
Fix worker issue with serializing