added the environment vars and cleanued up samples