feat: grammar improvements