minor changes and makefile cleaning improved