More fixes + planning