Add makefile
add more clean-up files in makefile
Fix bugs