Continued new corridor generator, improved trace output