Added a makefile, cleaned up a bit.