Parser and grammar partially fixed. No tested yet