Reorganize output, tasks for individual cantons, (sub-optimal) water features