adds lots of catkin-related changes