Increase compatibility with plan mode

[HenryQuillin]

[ap1969]

Same here - like what i've seen so far, but I clear context ruthlessly, so Sage just gets in the way of my workflow at that point. Love what you've done though - great work.