grammar changes and small bugs