General clean up and started to fix crafting