One bit that isn't fixed in the new code: I still believe this should be moved before the first echo_summary :-)