many corrections; support for ContextHeader (i.e. workspaces)