expanded on other tools and make targets