Various fixes for grammar

I fixed the ()*, ()? and some other stuff