some updates
Fixed some environments