Added more timing.  Fixed a few bugs.