Comment updates. Minor caching updates