Fixed context-control, including various other fixes