Remake of Makefile, some additions to Control