Pushing Makefile changes for building and starting