Plot Environment v2

Solved small issues