Changes to the setup of environemnt variables. There are still issues regarding the current GEMSTONE_NAME