small improvements in context