makefile and some minor things
merge