a makefile. and cosmetic changes