updating makefile and others
updating makefile and others