Added modular tools (+ a few things)
Merge pull request #76 from CraftThatBlock/master

Added modular tools (+ a few things) fixes #70