update context and modified some log