California fire mostly contained, death toll rises to 84