A bunch of fixes, start of Thaumcraft integration