Fixed preserving environment variables and improved commenting out of requiretty