added makefile and a few small changes