more changes and created makefile