Makefile tidying and added commit id logging to the control file