Added new obstacles to Environment, general improvements