fix typo
update path vars (some bug fixes)
added some env variables
Merge remote-tracking branch 'origin/master'