Added sourcing with ROS

Other small fixes