More fixes to stuff, and voxel improvements