Small comment changes and grammar changes