Fixes in the env. model, peparations for the Gazebo study, etc.