updated Makefile and cp.cpp