Merge pull request #999 from ahomatthew/develop

Develop
table speed
Fixes for table cols stuff