even more cosmetic and grammar changes