Revert to old Clinvar file, more bug fixes