Updates, and fixes for Contextly.