tweaked minor things to setup environment