Fixed numerous bugs.  Deleted data to re-run.