more tweaking, context mgr, and text formatting