Applied KoRE-Fixes from branch voxel.
Merge branch 'hax' of github.com:KoRE0/KoRE into hax