Bug fix and updates that were missed from gh import
Merge pull request #59 from mattmarcum/grid-bugfixes

Bug fix and updates that were missed from gh import