Refactored fields vs. environment ID
Minor fixes