Feature/catkin

Catkinized bride and fixes some issues