diff --git a/Makefile.vars b/Makefile.vars
index 0518952..2fd1953 100755
--- a/Makefile.vars
+++ b/Makefile.vars
@@ -21,8 +21,8 @@
  LICENSE := GPLv2
 
 # Project version.
- MAJOR := 2
- MINOR := 1
+ MAJOR := 3
+ MINOR := 0
  INDEV := yes
 
 # Project version string.
diff --git a/src/p7/dump.c b/src/p7/dump.c
index 068033f..5cc0a35 100644
--- a/src/p7/dump.c
+++ b/src/p7/dump.c
@@ -33,16 +33,22 @@ int dump(p7_handle_t *handle)
 		log("Warning: Bootcode information looks wiped out !\n");
 	if (info->os_wiped)
 		log("Warning: OS information looks wiped out!\n");
+	if (!info->username[0])
+		log("Warning: Username is not set.\n");
+
+	/* main information */
+	printf("CPU ID (probably out of date): %s\n", info->cpuid);
+	printf("Environnement ID: %s\n", info->hwid);
+	printf("Product ID: %s\n", info->product_id);
 
 	/* Preprogrammed ROM */
 	if (!info->preprog_rom_wiped) {
-		printf("Preprogrammed ROM capacity: " numformat "o\n",
+		printf("Preprogrammed ROM version: %02u.%02u",
+			info->preprog_rom_version.major, info->preprog_rom_version.minor);
+		if (info->preprog_rom_version.rev)
+			printf(" (%u)", info->preprog_rom_version.rev);
+		printf("\nPreprogrammed ROM capacity: " numformat "o\n",
 			info->preprog_rom_capacity);
-		printf("Preprogrammed ROM version: %02u.%02u.%04u\n",
-			info->preprog_rom_version.major, info->preprog_rom_version.minor,
-			info->preprog_rom_version.rev);
-		printf("Preprogrammed ROM type: %s\n",
-			info->preprog_rom_version.type);
 	}
 
 	/* ROM and RAM */
@@ -51,28 +57,27 @@ int dump(p7_handle_t *handle)
 
 	/* Bootcode */
 	if (!info->bootcode_wiped) {
-		printf("Bootcode version: %02u.%02u.%02u\n",
-			info->bootcode_version.major, info->bootcode_version.minor,
-			info->bootcode_version.rev);
-		printf("Bootcode type: %s\n", info->bootcode_version.type);
-		printf("Bootcode offset: " addrformat "\n", info->bootcode_offset);
+		printf("Bootcode version: %02u.%02u",
+			info->bootcode_version.major, info->bootcode_version.minor);
+		if (info->bootcode_version.rev)
+			printf(" (%u)", info->bootcode_version.rev);
+		printf("\nBootcode offset: " addrformat "\n", info->bootcode_offset);
 		printf("Bootcode size: " numformat "KiB\n", info->bootcode_size / 1024);
 	}
 
 	/* OS */
 	if (!info->os_wiped) {
-		printf("OS version: %02u.%02u.%02u\n", info->os_version.major,
-			info->os_version.minor, info->os_version.rev);
-		printf("OS type: %s\n", info->os_version.type);
-		printf("OS offset: " addrformat "\n", info->os_offset);
+		printf("OS version: %02u.%02u",
+			info->os_version.major, info->os_version.minor);
+		if (info->os_version.rev)
+			printf(" (%u)", info->os_version.rev);
+		printf("\nOS offset: " addrformat "\n", info->os_offset);
 		printf("OS size: " numformat "KiB\n", info->os_size / 1024);
 	}
 
 	/* Miscallenous information */
-	printf("Product ID: %s\n", info->product_id);
-	printf("Username: %s\n", info->username);
-	printf("Hardware ID: %s\n", info->hwid);
-	printf("CPU ID (probably out of date): %s\n", info->cpuid);
+	if (info->username[0])
+		printf("Username: %s\n", info->username);
 
 	return (0);
 }