Edit some comments
Integration Tests passing with cache.