Minor changes related to context, ContextNode, adding extracting files from context in shell