and some further fixing of the org agenda fixes