Fixing some stuff in grammar