major update of makefile and utils