Minor improvements of the Makefile
Renaming some of the agents