Added modular tools (+ a few things)