Uploading makefile, various fixes