Some fixups and DHS sources added.