Progress in formatted output!  Cleaned up a lot of useless code too