Various adjustments and partial yacc testing