Updated callback context; Fixed typos