Merge changes from hax
Merge changes from voxel branch