wip recur fixes