Simplified environment calculations v2

I missed some things in the previous batch.. These are added now