updated files and makefile