fix minor bug
update Makefile
change some variable names