catkinized version compiles. fixed tf