Cleaned up/Added to Thaumcraft