consolidate voxel-based indexing; cleanup/fix key constructions