minor pointer tweak
fixed context name handling bug