Lots of tiny fixes and tweaks

Also uses the XoticEngine dll instead of the project