some fixes to Fabienne's mbot branch