fix(plans): various bug fixes