diff --git a/install/setup.asm b/install/setup.asm
index 7494e87..e8dce29 100644
--- a/install/setup.asm
+++ b/install/setup.asm
@@ -14,13 +14,12 @@ Message db 0Dh,0Ah,'COS 2000 V3.02Fr programme d''installation',0Dh,0AH,'Inserez
 Message2 db 0Dh,0AH,'Creation du secteur de demarrage...',0Dh,0Ah,'$'
 Message3 db  0Dh,0AH,'Copie des fichiers systeme...',0Dh,0Ah,'$'
 Errormsg db 0Dh,0AH,'Erreur d''installation, contactez moi a COS2000@MULTIMANIA.COM !',0Dh,0AH,'$'
-Ok db 0Dh,0AH,'COS2000 a été correctement installé, veuillez redemarrer votre PC',0Dh,0AH,'$'
+Ok db 0Dh,0AH,'COS2000 a ete correctement installe, veuillez redemarrer votre PC',0Dh,0AH,'$'
 files db '*.*',0
 boot db 'boot.bin',0
 dat db 'data',0
 retu db 0Dh,0AH,'$'
 dta db 43 dup (0)
-nom db 25 dup (0)
 
 copycos:
         mov        ah,9
@@ -97,11 +96,7 @@ allfile:
         mov        ah,3ch
         push       cs
         pop        es
-        mov        si,offset dta+30-3
-        mov        di,offset nom
-        mov        cx,25
-        rep        movsb
-        mov        di,offset nom
+        mov        di,offset dta+30-3
         mov        word ptr [di],":a"
         mov        byte ptr [di+2],"\"
         xor        cx,cx
@@ -134,7 +129,7 @@ allfile:
         push       fs
         pop        ds
         mov        ah,3fh
-        mov        cx,000FFh
+        mov        cx,0FFFFh
         xor        dx,dx
         int        21h
         push       cs
diff --git a/programs/detect.asm b/programs/detect.asm
index 875b608..0e66e85 100644
--- a/programs/detect.asm
+++ b/programs/detect.asm
@@ -8,42 +8,52 @@ org 0100h
 include ..\include\pci.h
 
 start:
-call cleartext
-
 call getpciinfos
 mov pciversion,bx
 mov nbbus,cl
 mov pcitype,al
 
 mov si,offset msg
-call showstring0
-call line
+mov ah,13
+int 47h
+mov ah,6
+int 47h
 
 mov si,offset pcivers
-call showstring0
+mov ah,13
+int 47h
 xor edx,edx
 mov dx,bx
 xchg dl,dh
 mov cx,8
-call showhex
+mov ah,0Ah
+int 47h
 mov si,offset poin
-call showstring0
+mov ah,13
+int 47h
 shr dx,8
-call showhex
+mov ah,0Ah
+int 47h
 mov si,offset pcivers2
-call showstring0
-call line
+mov ah,13
+int 47h
+mov ah,6
+int 47h
 
 mov si,offset nbbuses
-call showstring0
+mov ah,13
+int 47h
 xor edx,edx
 mov dl,nbbus
 inc dl
-call showint
-call line
+mov ah,08
+int 47h
+mov ah,06
+int 47h
 
 mov si,offset typesof
-call showstring0
+mov ah,13
+int 47h
 mov di,offset types
 mov bx,7
 mov al,pcitype
@@ -52,14 +62,17 @@ bt ax,bx
 jnc nowas
 shl bx,1
 mov si,[di+bx]
-call showstring0
+mov ah,13
+int 47h
 mov si,offset spac
-call showstring0
+mov ah,13
+int 47h
 shr bx,1
 nowas:
 dec bx
 jns vote
-call line
+mov ah,6
+int 47h
 
 xor ax,ax
 xor cx,cx
@@ -68,36 +81,70 @@ search:
 call Getallfunctionsinfos
 jc stopthis
 
+mov bp,cx
 push cx di
 mov si,offset msg1
-call showstring0
+mov ah,13
+int 47h
 mov cx,16
 xor edx,edx
 mov dx,[di+pci.device]
-call showhex
+mov ah,0Ah
+int 47h
 mov si,offset msg2
-call showstring0
+mov ah,13
+int 47h
 mov dx,[di+pci.vendor]
-call showhex
+mov ah,0Ah
+int 47h
+mov si,offset msg4
+mov ah,13
+int 47h
+xor dx,dx
+mov dl,al
+mov cx,8
+mov ah,0Ah
+int 47h
+mov ah,07
+mov dl,'.'
+int 47h
+mov dx,bp
+xor dh,dh
+mov cx,8
+mov ah,0Ah
+int 47h
+mov ah,07
+mov dl,'.'
+int 47h
+mov dx,bp
+shr dx,8
+mov cx,8
+mov ah,0Ah
+int 47h
+mov ah,05h
+int 47h
 mov si,offset msg3
-call showstring0
+mov ah,13
+int 47h
 mov cl,[di+pci.class]
 mov ch,[di+pci.subclass]
 mov di,offset temp
 call getpciclass
 mov si,di
-call showstring0
+mov ah,13
+int 47h
 mov si,offset poin
-call showstring0
+mov ah,13
+int 47h
 mov di,offset temp
 call getpcisubclass
 mov si,di
-call showstring0
-call line
+mov ah,13
+int 47h
+mov ah,06
+int 47h
 pop di cx
 
-jmp noerror
-noerror:
 inc ch
 cmp ch,7
 jbe search
@@ -110,11 +157,14 @@ xor cl,cl
 inc al
 cmp al,16
 jbe search
-ret
+xor ax,ax
+int 16h
+db 0CBh
 
-msg3 db ' Classe:',0
+msg3 db ' Classe :',0
 msg1 db 'Peripherique :',0
 msg2 db ' Constructeur :',0 
+msg4 db ' iD :',0
 msg db 'COS2000 hardware detecteur V1.1',0
 pcivers  db 'BIOS PCI version ',0
 pcivers2 db ' a ete detecte !',0
@@ -308,7 +358,7 @@ dw offset subclass67
 subclass60 db 'hote',0
 subclass61 db 'isa',0
 subclass62 db 'eisa',0
-subclass63 db 'mc',0
+subclass63 db 'mca',0
 subclass64 db 'pci',0
 subclass65 db 'pcmcia',0
 subclass66 db 'nubus',0
@@ -324,9 +374,9 @@ class8d:
 dw offset subclass80
 dw offset subclass81
 dw offset subclass82
-subclass80 db 'pic 8259a',0
-subclass81 db 'dma 8237',0
-subclass82 db 'tim 8254',0
+subclass80 db 'pic',0
+subclass81 db 'dma',0
+subclass82 db 'timer',0
 
 class9d:
 dw offset subclass90
@@ -357,10 +407,12 @@ dw offset subclass120
 dw offset subclass121
 dw offset subclass122
 dw offset subclass123
+dw offset subclass124
 subclass120 db 'firewire',0
 subclass121 db 'access',0
 subclass122 db 'ssa',0
 subclass123 db 'usb',0
+subclass124 db 'smbus',0
 
 ;bx pci version, cl nbbus, al pci type
 getPciInfos:
@@ -380,29 +432,22 @@ errorpci:
     	pop 	dx    	
       ret
 
-;al=bus bl=index cl=deviceid ch=func->dl
-getfunctioninfo:
-    push eax bx cx
-    mov ah,80h
-    shl eax,16
-    mov ah,cl
-    shl ah,3
-    or ah,ch
-    mov al,bl
-    and al,0fch
-    mov dx,0cf8h
-    out dx,eax
-    mov dx,0CFCh
-    and bl,3
-    or  dl,bl
-    in  al,dx
-    mov dl,al
-    pop cx bx eax
-    ret
-
 ;al=bus cl=deviceid ch=func es:di
 Getallfunctionsinfos:
     push ax bx dx di
+    cmp  ch,0
+    je   amultiorfirst
+    mov  bl,0Eh
+    push cx
+    xor  ch,ch
+    call getfunctioninfo
+    pop  cx
+    and  dl,80h
+    cmp  dl,0
+    jne  amultiorfirst
+    mov  word ptr [di],0000h
+    jmp  notexist
+amultiorfirst:
     xor bl,bl
 goinfos:
     call getfunctioninfo
@@ -427,180 +472,73 @@ notexist:
     stc
     pop di dx bx ax
     ret
+    
+    ; PCI TYPE 1
+;*******************************************************************
+config1_addr	equ 0CF8h
+config1_data	equ 0CFCh
 
-;=============CLEAR=========
-;Efface l'ecran texte
-;-> 
-;<- 
-;=============================
-cleartext:
-push es eax cx di
-xor di,di
-mov ax,0b800h
-mov es,ax
-mov eax,07200720h
-mov cx,cs:pagesize
-shr cx,2
-cld
-rep stosd
-mov cs:xy,0
-mov cs:x,0
-mov cs:y,0
-pop di cx eax es
-ret
+pci_type1_detect:
+                 mov     dx, config1_addr+3
+                 mov     al, 01h
+                 out     dx,al
+                 mov     dx,config1_addr
+	         in      eax,dx
+	         mov     ecx,eax
+		 mov     eax,80000000h
+		 out     dx,eax
+		 in      eax,dx
+		 cmp     eax,80000000h
+		 jne     endofdetectiontype1
+		 mov     eax,ecx
+		 out     dx,eax
+endofdetectiontype1:		
+		 ret
+
+                 ;al=bus bl=index cl=deviceid ch=func->dl
+getfunctioninfo:
+    push eax bx cx
+    mov ah,80h
+    shl eax,16
+    mov ah,cl
+    shl ah,3
+    or ah,ch
+    mov al,bl
+    and al,0fch
+    mov dx,0cf8h
+    out dx,eax
+    mov dx,0CFCh
+    and bl,3
+    or  dl,bl
+    in  al,dx
+    mov dl,al
+    pop cx bx eax
+    ret	
 
 
-;==========LINE=========
-;remet le curseur a la ligne
-;-> 
-;<- 
-;=============================
-line:
-push bx cx di es
-mov bh,cs:x
-mov bl,cs:y
-xor bh,bh
-mov cl,cs:lines
-dec cl
-dec cl
-cmp bl,cl
-jne scro
-dec bl
-mov cl,1
-call scrolldown
-scro:
-inc bl
-call setxy
-pop es di cx bx
-ret
+; PCI TYPE 2
+;*******************************************************************
+config2_reg0	equ 0CFBh
+config2_reg1	equ 0CF8h
+config2_reg2    equ 0CFAh
 
-;==========SETXY=========
-;Change les coordonnées du curseur a X:AH,Y:AL
-;-> AX
-;<- es di
-;=============================
-setxy:
-push ax bx dx
-mov cs:x,bh
-mov cs:y,bl
-mov al,bl
-mov bl,bh
-xor bh,bh
-mov di,bx
-mul cs:columns
-add di,ax
-shl di,1
-mov cs:xy,di
-mov ax,0B800h
-mov es,ax
-pop dx bx ax
-ret
-
-;==========SCROLLDOWN=========
-;defile de cx lines vers le bas
-;-> CX
-;<- 
-;=============================
-scrolldown:
-push ax cx dx si di ds es
-mov si,0B800h
-mov es,si
-mov ds,si
-mov ax,cx
-mul cs:columns
-shl ax,1
-mov si,ax
-mov cx,cs:pagesize
-sub cx,si
-xor di,di
-cld
-rep movsb
-pop es ds di si dx cx ax
-ret
-
-
-;===================================Afficher un int EDX a l'‚cran en ah,al================
-ShowInt:
-        push    eax bx cx edx esi di es ds
-        mov     di,cs:xy
-        mov     cx,0B800h
-        mov     es,cx
-        xor     cx,cx
-        mov     eax,edx
-        mov     esi,10
-        mov     bx,offset showbuffer+27
-decint3:
-        xor     edx,edx
-        div     esi
-        add     dl,'0'
-        mov     dh,7
-        sub     bx,2
-        add     cx,2
-        mov     cs:[bx],dx
-        cmp     ax,0
-        jne     decint3
-        mov     si,bx
-        push    cs
-        pop     ds
-        cld
-        rep     movsb
-	  mov	    cs:xy,di
-        pop     ds es di esi edx cx bx eax 
-ret       
-
-;================Affiche la chaine 0 de caractŠre contenue dans ds:si
-showstring0:
-        push    es cx si di
-        mov     di,cs:xy
-        mov     cx,0B800h
-        mov     es,cx
-        mov     ch,cs:colors
-strinaize0:
-        mov     cl,[si]
-        cmp     cl,0
-        je      no0
-        mov     es:[di],cx
-        add     di,2
-        inc     si
-        jmp     strinaize0
-        no0:
-        mov     cs:xy,di
-        pop     di si cx es
-        ret
-
-;==============================Affiche le nombre nb hexa en EDX==============
-ShowHex:
-        push    es ax bx cx edx di
-        mov     di,cs:xy
-        mov     bx,0B800h
-        mov     es,bx
-        mov     ax,cx
-        sub     cx,32
-        neg     cx
-        shl     edx,cl
-        mov     ch,cs:colors
-        shr     ax,2
-Hexaize:
-        rol     edx,4
-        mov     bx,dx
-        and     bx,0fh
-        mov     cl,cs:[bx+offset Tab]
-        mov     es:[di],cx
-        add     di,2
-        dec     al
-        jnz     Hexaize
-        mov     cs:xy,di
-        pop     di edx cx bx ax es
-        ret
-
-Tab db '0123456789ABCDEF'
-x db 0
-y db 0
-xy dw 0
-pagesize dw 80*25*2
-lines db 25
-columns db 80
-colors db 7
-showbuffer db 35 dup (0FFh)
+pci_type2_detect:
+                 xor     ax,ax
+                 mov     dx,config2_reg0
+                 out     dx,ax
+                 mov     dx,config2_reg1
+                 out     dx,ax
+                 mov     dx,config2_reg2
+                 out     dx,ax
+                 mov     ax,config2_reg1
+                 in      al,dx
+                 cmp     al,0
+                 jne     endofdetectiontype2
+                 mov     ax,config2_reg0
+                 in      al,dx
+                 cmp     al,0
+                 jne     endofdetectiontype2
+endofdetectiontype2:
+                    ret
 
 end start