bison is working
Some last changes :(