Add a makefile and some minor updates