Added env.sh configure, modified something