Expanded info on environment detection via machine name