feat: grammar general improvements