Minor update
Add support for variables defined from environment variables
Fix string escaping in script generators