context improvements