Take care of duplicate key errors.  More updates and some testing.