Fixed typos and added extra-headers context field.