Merge some changes I made, mostly with Irrlicht