fixing some stuff in parsing grammar