Shape improvements
Voxel bug fixes