Added env functions and some more setup scriipts