Adding aliases, more env vars, and follow symlinks