few minor tweaks and fixes to plans