Improvements and addition of new env. variables.