Case changes and grammar fixes