Continued new corridor generator, some trace output changes