fix minor issue and udpate makefile