diff --git a/Analyzing-a-media-dump.mediawiki b/Analyzing-a-media-dump.mediawiki
index 230b915..9114323 100644
--- a/Analyzing-a-media-dump.mediawiki
+++ b/Analyzing-a-media-dump.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This command will analyze a media dump, and if the format is recognized and you choose so, it will search for [[supported partitioning schemes|Partitioning-schemes-recognized-by-Aaru]] and [[supported filesystems|Filesystems-recognized-by-Aaru]] on the dump, showing information about them.
+This command will analyze a media dump, and if the format is recognized and you choose so, it will search for [[Partitioning-schemes-recognized-by-Aaru|supported partitioning schemes]] and [[Filesystems-recognized-by-Aaru|supported filesystems]] on the dump, showing information about them.
==Command usage==
Aaru analyze -d [true/false] -e [encoding] -f [true/false] -i -p [true/false] -v [true/false]
diff --git a/Checksum-benchmarking.mediawiki b/Checksum-benchmarking.mediawiki
index 49378a5..e67358f 100644
--- a/Checksum-benchmarking.mediawiki
+++ b/Checksum-benchmarking.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This operation will create random data in RAM and calculate how fast are we calculating all known [[checksums and hashes|Supported-checksums]]
+This operation will create random data in RAM and calculate how fast are we calculating all known [[Supported-checksums|checksums and hashes]]
==Command usage==
Aaru benchmark -b [block size] -d [true/false] -s [buffer size] -v [true/false]
diff --git a/Comparison.mediawiki b/Comparison.mediawiki
index 49f57c8..bd40cbd 100644
--- a/Comparison.mediawiki
+++ b/Comparison.mediawiki
@@ -1,5 +1,10 @@
In this page you can find a comparison between Aaru and other dump image managers or creators.
+You can see a [[Comparison#comparison of optical discs image managers|comparison of optical discs image managers]],
+a [[Comparison#comparison of floppy disk image managers|comparison of floppy disk image managers]], a
+[[Comparison#comparison of hard disk image managers|comparison of hard disk image managers]] and a
+[[Comparison#comparison of digital tape image managers|comparison of digital tape image managers]].
+
==Comparison of optical discs image managers==
{|
!
diff --git a/Creating-metadata-sidecar-XML.mediawiki b/Creating-metadata-sidecar-XML.mediawiki
index 82b47ff..ca471f9 100644
--- a/Creating-metadata-sidecar-XML.mediawiki
+++ b/Creating-metadata-sidecar-XML.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This operation will analyze a media dump, and if the format is recognized, create a CICM XML metadata sidecar with all information that can be automatically get about it, as well as all [[supported checksum algorithms|Supported-checksums]].
+This operation will analyze a media dump, and if the format is recognized, create a CICM XML metadata sidecar with all information that can be automatically get about it, as well as all [[Supported-checksums|supported checksum algorithms]].
==Command usage==
Aaru create-sidecar -b [block size] -d [true/false] -e [encoding] -i -t tape [true/false] -v [true/false]
diff --git a/Decoding-and-printing-media-tags.mediawiki b/Decoding-and-printing-media-tags.mediawiki
index 72b6704..661c211 100644
--- a/Decoding-and-printing-media-tags.mediawiki
+++ b/Decoding-and-printing-media-tags.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This operation will decode all [[sector tags|Sector-tags]] and [[media tags|Media-tags]] on a media dump image.
+This operation will decode all [[Sector-tags|sector tags]] and [[Media-tags|media tags]] on a media dump image.
==Command usage==
Aaru decode -d [true/false] -i -k [true/false] -l [sectors] -t [true/false] -s [start sector] -v [true/false]
diff --git a/Extracting-files-from-a-media-dump.mediawiki b/Extracting-files-from-a-media-dump.mediawiki
index 7dd5b63..6443f70 100644
--- a/Extracting-files-from-a-media-dump.mediawiki
+++ b/Extracting-files-from-a-media-dump.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This operation will analyze and find all filesystems in a media dump and extract the files that are contained in [[supported filesystems|Filesystems-recognized-by-Aaru]]
+This operation will analyze and find all filesystems in a media dump and extract the files that are contained in [[Filesystems-recognized-by-Aaru|supported filesystems]]
==Command usage==
Aaru extract-files -d [true/false] -e [encoding] -i -o
diff --git a/Getting-information-from-a-physical-device.mediawiki b/Getting-information-from-a-physical-device.mediawiki
index 37c51a5..c318a5e 100644
--- a/Getting-information-from-a-physical-device.mediawiki
+++ b/Getting-information-from-a-physical-device.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This operation will request and show all information about a physical device. For information about supported physical devices check [[the list of supported physical devices|Supported-devices]]
+This operation will request and show all information about a physical device. For information about supported physical devices check [[Supported-devices|the list of supported physical devices]]
==Command usage==
Aaru device-info -d [true/false] -i -v [true/false] -w [prefix]
diff --git a/Getting-information-from-media-inserted-in-a-physical-device.mediawiki b/Getting-information-from-media-inserted-in-a-physical-device.mediawiki
index 23a2e4b..9e19c3c 100644
--- a/Getting-information-from-media-inserted-in-a-physical-device.mediawiki
+++ b/Getting-information-from-media-inserted-in-a-physical-device.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This operation will request and show all information about the inserted media in a physical device. For information about supported physical devices check [[the list of supported physical devices|Supported-devices]]
+This operation will request and show all information about the inserted media in a physical device. For information about supported physical devices check [[Supported-devices|the list of supported physical devices]]
==Command usage==
Aaru media-info -d [true/false] -i -v [true/false] -w [prefix]
diff --git a/List-files.mediawiki b/List-files.mediawiki
index 31ca8c8..337ff7f 100644
--- a/List-files.mediawiki
+++ b/List-files.mediawiki
@@ -1,5 +1,5 @@
==Command description==
-This operation will analyze and find all filesystems in a media dump and list all the files that are contained in [[supported filesystems|Filesystems-recognized-by-Aaru]]
+This operation will analyze and find all filesystems in a media dump and list all the files that are contained in [[Filesystems-recognized-by-Aaru|supported filesystems]]
==Command usage==
Aaru ls -d [true/false] -e [encoding] -i -l [true/false] -v [true/false]
diff --git a/README.mediawiki b/README.mediawiki
index 33a2c6c..73d315d 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -3,42 +3,42 @@ Welcome to the Aaru wiki.
Aaru is a tool designed to handle different media dump formats (also called disc or disk images) and do common operations with them.
'''What do you want to do?'''
-* [[Analyze a media dump|Analyzing-a-media-dump]]
-* [[Check how fast will Aaru create hashes on my computer|Checksum-benchmarking]]
-* [[Get checksums or hashes from a dump|Getting-hashes-and-checksums-from-a-media-dump]]
-* [[Compare two media dumps|Comparing-two-media-dumps]]
-* [[Set which information will Aaru send to you|Configure-Aaru-statistics]]
-* [[Convert a media dump from one format to another|Convert-image]]
-* [[Create XML sidecar with metadata of a dump|Creating-metadata-sidecar-XML]]
-* [[Decode media tags and print them|Decoding-and-printing-media-tags]]
-* [[Get information from a physical device|Getting-information-from-a-physical-device]]
-* [[Test physical device capabilities and create an XML report of them|Reporting-physical-device-capabilities]]
-* [[Create a media dump from a physical device|Creating-a-dump-from-physical-media]]
-* [[Calculate entropy of a media dump|Calculate-dump-contents-entropy]]
-* [[Extract all files contained in a media dump|Extracting-files-from-a-media-dump]]
-* [[Get a list of all formats supported|List-supported-formats]]
-* [[Get a list of all supported physical devices|List-supported-devices]]
-* [[Get a list of all supported character set encodings|List-supported-encodings]]
-* [[List all files contained in a media dump|List-files]]
-* [[Lists all options supported by read-only filesystems and writable media images|List-options]]
-* [[Show information about media inserted in a physical device|Getting-information-from-media-inserted-in-a-physical-device]]
-* [[Check readability of the media inserted in a physical device|Check-readability-of-the-media-inserted-in-a-physical-device]]
-* [[Get a hexadecimal print of a media dump sector or block|Get-a-hexadecimal-print-of-a-media-dump-sector-or-block]]
-* [[See my own usage statistics|Show-statistics]]
-* [[Verify integrity of a media dump or its contents|Verifying-media-dump-integrity]]
+* [[Analyzing-a-media-dump|Analyze a media dump|]]
+* [[Checksum-benchmarking|Check how fast will Aaru create hashes on my computer]]
+* [[Getting-hashes-and-checksums-from-a-media-dump|Get checksums or hashes from a dump]]
+* [[Comparing-two-media-dumps|Compare two media dumps]]
+* [[Configure-Aaru-statistics|Set which information will Aaru send to you]]
+* [[Convert-image|Convert a media dump from one format to another]]
+* [[Creating-metadata-sidecar-XML|Create XML sidecar with metadata of a dump]]
+* [[Decoding-and-printing-media-tags|Decode media tags and print them]]
+* [[Getting-information-from-a-physical-device|Get information from a physical device]]
+* [[Reporting-physical-device-capabilities|Test physical device capabilities and create an XML report of them]]
+* [[Creating a dump from physical media|Create a media dump from a physical device]]
+* [[Creating-a-dump-from-physical-media|Calculate entropy of a media dump]]
+* [[Extracting-files-from-a-media-dump|Extract all files contained in a media dump]]
+* [[List-supported-formats|Get a list of all formats supported]]
+* [[List-supported-devices|Get a list of all supported physical devices]]
+* [[List-supported-encodings|Get a list of all supported character set encodings]]
+* [[List-files|List all files contained in a media dump]]
+* [[List-options|Lists all options supported by read-only filesystems and writable media images]]
+* [[Getting-information-from-media-inserted-in-a-physical-device|Show information about media inserted in a physical device]]
+* [[Check-readability-of-the-media-inserted-in-a-physical-device|Check readability of the media inserted in a physical device]]
+* [[Get-a-hexadecimal-print-of-a-media-dump-sector-or-block|Get a hexadecimal print of a media dump sector or block]]
+* [[Show-statistics|See my own usage statistics]]
+* [[Verifying-media-dump-integrity|Verify integrity of a media dump or its contents]]
'''What is supported by Aaru?'''
-* [[Filters|Supported-filters]]
-* [[Media dump formats|Media-dump-formats-supported-by-Aaru]]
-* [[Partitioning schemes|Partitioning-schemes-recognized-by-Aaru]]
-* [[Filesystems|Filesystems-recognized-by-Aaru]]
-* [[Physical devices|Supported-devices]]
-* [[Checksum and hashes|Supported-checksums]]
-* [[Known media tags|Media-tags]]
-* [[Known sector/block tags|Sector-Tags]]
+* [[Supported filters|Filters]]
+* [[Media dump formats supported by Aaru|Media dump formats]]
+* [[Partitioning schemes recognized by Aaru|Partitioning schemes]]
+* [[Filesystems-recognized-by-Aaru|Filesystems]]
+* [[Supported devices|Physical devices]]
+* [[Supported-checksums|Checksum and hashes]]
+* [[Media-tags|Known media tags|]]
+* [[Sector-Tags|Known sector/block tags]]
-'''[[Comparing Aaru to similar software|Comparison]]'''
+'''[[Comparison|Comparing Aaru to similar software]]'''
-'''[[Frequently Asked Questions|Frequently-Asked-Questions]]'''
+'''[[Frequently Asked Questions]]'''
-'''[[Bugs in other dumping software|Bugs-in-other-dumping-software]]'''
+'''[[Bugs in other dumping software]]'''