Added new tool to makefile and fixed some issues