Fixing some grammar stuffs