Correction of some bugs and starting implementation of controlWay