More fixes after robot testing

... and moving over to catkinized houshold.