cleanup Makefile, add missing dependencies, packages tools seperately - still broken...