Removed progress bar, added graph time.  More error checks