updates and bugfixes for plan-managing workflow