more cleanup and progress toward voxel querying