minor grammar changes and todos