Make file and some updates