Further improvements to ROS integration. Launch file failure is still messy.