Rename .cc to .cpp, edit Makefile for make clean
Fix bugs