diff --git a/src/include/NESCarts.h b/src/include/NESCarts.h
index f04e8a2..69c7001 100755
--- a/src/include/NESCarts.h
+++ b/src/include/NESCarts.h
@@ -24,17 +24,17 @@
 
 typedef struct NesCart_
 {  
-    uint32_t PROMSize, /* Size of PROM */
-             VROMSize; /* Size of VROM */
-    char     MapperID;          /* Mapper Type */
+    uint32_t PROMSize,  /* Size of PROM */
+             VROMSize;  /* Size of VROM */
+    char     MapperID;  /* Mapper Type */
     uint8_t  Flags;
     char    *FileName;
-    uint8_t *File;             /* Pointer on the file in memory */
-    uint8_t *PROMBanks;        /* Pointer on the first PROM */
-    uint8_t *VROMBanks;        /* Pointer on the first VROM */
+    uint8_t *File;      /* Pointer on the file in memory */
+    uint8_t *PROMBanks; /* Pointer on the first PROM */
+    uint8_t *VROMBanks; /* Pointer on the first VROM */
 } NesCart;
 
-void DumpCartProperties();
+void DumpCartProperties(FILE *out, NesCart * cart);
 int LoadCart(const char *filename, NesCart * cart);
 
 #endif
diff --git a/src/include/mappers/manager.h b/src/include/mappers/manager.h
index ec252fe..65906d0 100755
--- a/src/include/mappers/manager.h
+++ b/src/include/mappers/manager.h
@@ -23,7 +23,7 @@ typedef int (*MapperInit)      (NesCart * cart);
 typedef int (*MapperWriteHook) (register unsigned short Addr, 
                                 register unsigned char Value);
 typedef int (*MapperIRQ)       (int cycledone);
-typedef void (*MapperDump)     ();
+typedef void (*MapperDump)     (FILE *fp);
 
 #ifdef __TINES_MAPPERS__
 
@@ -51,10 +51,12 @@ void set_prom_bank_32k(unsigned short addr,int slot);
 
 /* Available functions outside of mappers */
 
-       void mapper_list       ();
-       int  mapper_init       (NesCart *cart);
-extern int  (*mapper_irqloop) (int cyclodone);
-extern void (*mapper_dump)    (FILE *fp);
+void mapper_list();
+int  mapper_init(NesCart *cart);
+
+extern MapperIRQ       mapper_irqloop;
+extern MapperDump      mapper_dump;
+extern MapperWriteHook mapper_hook;
 
 #endif /* __TINES_MAPPERS__ */
 
diff --git a/src/main.c b/src/main.c
index 703e1b7..cf826b6 100755
--- a/src/main.c
+++ b/src/main.c
@@ -574,8 +574,9 @@ void WrHook4000Multiplexer(byte addr, byte value)
             }
 	    
             break;
-	    //    default:
-	    //Page40[addr] = value;
+
+        default:
+	      Page40[addr] = value;
 	    // console_printf(Console_Default, "40%02X: 0x%02X\n", addr, value);       
 	    //        console_printf(Console_Default, "pAPU: 0x%X @ 0x40%X\n", value, addr);
    }
diff --git a/src/mappersmanager/mappers/mmc1.h b/src/mappersmanager/mappers/mmc1.h
index 70a252f..6a8e82a 100644
--- a/src/mappersmanager/mappers/mmc1.h
+++ b/src/mappersmanager/mappers/mmc1.h
@@ -17,4 +17,4 @@
 
 int mmc1_InitMapper  (NesCart *cart);
 int mmc1_MapperIRQ   (int cycledone);
-void mmc1_MapperDump ();
\ No newline at end of file
+void mmc1_MapperDump (FILE *fp);
\ No newline at end of file
diff --git a/src/mappersmanager/mappers/mmc4.h b/src/mappersmanager/mappers/mmc4.h
index 8a45774..59a9c29 100644
--- a/src/mappersmanager/mappers/mmc4.h
+++ b/src/mappersmanager/mappers/mmc4.h
@@ -16,4 +16,4 @@
 #include <mappers/manager.h>
 
 void mmc4_MapperDump(FILE *fp);
-int mmc4_InitMapper(NesCart * cart);
+int mmc4_InitMapper(NesCart * cart);
\ No newline at end of file
diff --git a/src/mappersmanager/mappers/norom.c b/src/mappersmanager/mappers/norom.c
index a9c024d..fb27131 100644
--- a/src/mappersmanager/mappers/norom.c
+++ b/src/mappersmanager/mappers/norom.c
@@ -45,7 +45,7 @@ void norom_MapperWriteHook(register byte Addr, register byte Value)
    return;
 }
 
-void norom_MapperDump (FILE *fp)
+void norom_MapperDump(FILE *fp)
 {
    fprintf(fp, "norom mapper have nothing to dump");
 }
\ No newline at end of file
diff --git a/src/mappersmanager/mappers/norom.h b/src/mappersmanager/mappers/norom.h
index d8109b0..ac0e71e 100644
--- a/src/mappersmanager/mappers/norom.h
+++ b/src/mappersmanager/mappers/norom.h
@@ -17,4 +17,4 @@
 
 int norom_InitMapper  (NesCart *cart);
 int norom_MapperIRQ   (int cycledone);
-void norom_MapperDump ();
\ No newline at end of file
+void norom_MapperDump (FILE *fp);
\ No newline at end of file