fixed makefile; env.sh