Name fixing and an NPE fixed

Also, I added some more fixes for tool support in recipes, correct
enchantment names being displayed and code cleaning