correct context-related comments