Fixed up parser and generator