various bugfixes, mostly regarding unfinished tasks