small changes and added makefile