Housekeeping and edits to Hiv()