Improving catkin class and addressing issues in various recipes