Pre-processor written, but largely untested. Also the code generation algorithm was made more robust.