makefile improvements
scripts improvements