adjust code structure
changing the comment style:)
fix Makefile
add debug code