fix(plans): lots of bug fixes & cleanup