some adjustments and added a makefile