Some cleanups and a makefile