Update for definitive ROS API. Also big cleanup