more table stuff
Merge pull request #857 from ahomatthew/develop

more table stuff