Some additions and fixes
Merge branch 'master' of https://github.com/Azanor/thaumcraft