dding a makefile, various corrections