compilation fixed
makefile cleanups