Correcting mistakes in the generation of scanners and parsers. Changing 'rm' messages
Updating TODO