diff --git a/ci-scripts/doc/ci_dev_home.md b/ci-scripts/doc/ci_dev_home.md
index f6cf3a1cf03942cffbcfe972c9553095e311b7a4..3bfc36d3f45b468b884cada014fac1110f48dd42 100644
--- a/ci-scripts/doc/ci_dev_home.md
+++ b/ci-scripts/doc/ci_dev_home.md
@@ -14,14 +14,14 @@
 
 VM-based RF-Less Environment:
 
-*  [How to setup your test env](vm_based_simulator_env)
-*  [How to deal with OAI source files](vm_based_simulator_sources)
-*  [The main script](vm_based_simulator_main_scripts)
-*  [How to create one or several VM instances](vm_based_simulator_create)
-*  [How to build an OAI variant](vm_based_simulator_build)
-*  [How the build is checked](vm_based_simulator_check_build)
-*  [How to test an OAI variant](vm_based_simulator_test)
-*  [How to destroy all VM instances](vm_based_simulator_destroy)
+*  [How to setup your test env](./vm_based_simulator_env.md)
+*  [How to deal with OAI source files](./vm_based_simulator_sources.md)
+*  [The main script](./vm_based_simulator_main_scripts.md)
+*  [How to create one or several VM instances](./vm_based_simulator_create.md)
+*  [How to build an OAI variant](./vm_based_simulator_build.md)
+*  [How the build is checked](./vm_based_simulator_check_build.md)
+*  [How to test an OAI variant](./vm_based_simulator_test.md)
+*  [How to destroy all VM instances](./vm_based_simulator_destroy.md)
 
 Currently missing documentation:
 *  How to generate a build report
diff --git a/ci-scripts/doc/vm_based_simulator_build.md b/ci-scripts/doc/vm_based_simulator_build.md
index a064c7c1ffd8cb36c28cc190ee524014dfedb563..826be457bedcd0ff580dc372b69fa61b2f61ae3a 100644
--- a/ci-scripts/doc/vm_based_simulator_build.md
+++ b/ci-scripts/doc/vm_based_simulator_build.md
@@ -256,7 +256,7 @@ Here the `--keep-vm-alive` option is used to keep the VM alive and performs some
 
 ---
 
-Next step: [how the build is checked](vm_based_simulator_check_build)
+Next step: [how the build is checked](./vm_based_simulator_check_build.md)
 
-You can also go back to the [CI dev main page](./ci_dev_home)
+You can also go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/ci-scripts/doc/vm_based_simulator_check_build.md b/ci-scripts/doc/vm_based_simulator_check_build.md
index 7bef5f3b15e4bd67746790cfb95852a714c6a2d8..0d9058377dcfd2ed6c15f20a6aa725b44edab7f3 100644
--- a/ci-scripts/doc/vm_based_simulator_check_build.md
+++ b/ci-scripts/doc/vm_based_simulator_check_build.md
@@ -38,7 +38,7 @@ Source file concerned: `ci-scripts/waitBuildOnVM.sh`
 
 ---
 
-Next step: [how to test a function](vm_based_simulator_test)
+Next step: [how to test a function](./vm_based_simulator_test.md)
 
-You can also go back to the [CI dev main page](./ci_dev_home)
+You can also go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/ci-scripts/doc/vm_based_simulator_create.md b/ci-scripts/doc/vm_based_simulator_create.md
index 5d7bad4310c254366cb9dfa0cd56a5d5737f750e..c75221f6db08c1d82c814d68835911e9b33d7329 100644
--- a/ci-scripts/doc/vm_based_simulator_create.md
+++ b/ci-scripts/doc/vm_based_simulator_create.md
@@ -105,7 +105,7 @@ Finally, typically I never use the `create` command. I use directly the build co
 
 ---
 
-Next step: [how to build an OAI variant](vm_based_simulator_build)
+Next step: [how to build an OAI variant](./vm_based_simulator_build.md)
 
-You can also go back to the [CI dev main page](./ci_dev_home)
+You can also go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/ci-scripts/doc/vm_based_simulator_destroy.md b/ci-scripts/doc/vm_based_simulator_destroy.md
index d35d4062beaf5ef0b19684ad4cc4468eac28e5a9..ad87d18fa964a8d3699b479e6402c52bdb775e32 100644
--- a/ci-scripts/doc/vm_based_simulator_destroy.md
+++ b/ci-scripts/doc/vm_based_simulator_destroy.md
@@ -67,5 +67,5 @@ $ ./ci-scripts/oai-ci-vm-tool destroy --job-name raphael --build-id 1
 
 ---
 
-You can go back to the [CI dev main page](./ci_dev_home)
+You can go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/ci-scripts/doc/vm_based_simulator_env.md b/ci-scripts/doc/vm_based_simulator_env.md
index 000f7499464cee8d36482b6c131852475317bdc8..5dbcfbd93118db7f224691741cbd96592936dbd6 100644
--- a/ci-scripts/doc/vm_based_simulator_env.md
+++ b/ci-scripts/doc/vm_based_simulator_env.md
@@ -117,7 +117,7 @@ This last file (/etc/apt/apt.conf.d/01proxy) is very important since it is teste
 
 ---
 
-We can now switch to the next step: [how to deal with oai sources](./vm_based_simulator_sources)
+We can now switch to the next step: [how to deal with oai sources](./vm_based_simulator_sources.md)
 
-You can also go back to the [CI dev main page](./ci_dev_home)
+You can also go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/ci-scripts/doc/vm_based_simulator_main_scripts.md b/ci-scripts/doc/vm_based_simulator_main_scripts.md
index 96a35b1fdb1507ec4f16b4411c40a131669c0865..e8105857575a08fb068d6cfc7d0243fe246e454f 100644
--- a/ci-scripts/doc/vm_based_simulator_main_scripts.md
+++ b/ci-scripts/doc/vm_based_simulator_main_scripts.md
@@ -81,7 +81,7 @@ There are many more variables.
 
 ---
 
-Next step: [how to create one or several VM instances](vm_based_simulator_create)
+Next step: [how to create one or several VM instances](./vm_based_simulator_create.md)
 
-You can also go back to the [CI dev main page](./ci_dev_home)
+You can also go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/ci-scripts/doc/vm_based_simulator_sources.md b/ci-scripts/doc/vm_based_simulator_sources.md
index 0e59a5ca047e623b2f12f5b676e789d9bce28186..4bba6a8a09580a6ac620fcb90e2c2139fb4f1baa 100644
--- a/ci-scripts/doc/vm_based_simulator_sources.md
+++ b/ci-scripts/doc/vm_based_simulator_sources.md
@@ -79,7 +79,7 @@ See [section](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/ci/enb-mast
 
 ---
 
-Next step: [the main scripts](vm_based_simulator_main_scripts)
+Next step: [the main scripts](./vm_based_simulator_main_scripts.md)
 
-You can also go back to the [CI dev main page](./ci_dev_home)
+You can also go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/ci-scripts/doc/vm_based_simulator_test.md b/ci-scripts/doc/vm_based_simulator_test.md
index e8b9975317eef1a874f9c7855bff3eab80ebb8bd..bc5a38b62800c5fd1eb8912a503b19487540ad11 100644
--- a/ci-scripts/doc/vm_based_simulator_test.md
+++ b/ci-scripts/doc/vm_based_simulator_test.md
@@ -254,7 +254,7 @@ $ ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-dev
 ```
 ---
 
-Final step: [how to properly destroy all VM instances](vm_based_simulator_destroy)
+Final step: [how to properly destroy all VM instances](./vm_based_simulator_destroy.md)
 
-You can also go back to the [CI dev main page](./ci_dev_home)
+You can also go back to the [CI dev main page](./ci_dev_home.md)
 
diff --git a/doc/FEATURE_SET.md b/doc/FEATURE_SET.md
index c0c7fbfefdac4b19c7d454f1e1e526a30a950a33..77c628dda8fb54741d19c419b0083df55ad732db 100644
--- a/doc/FEATURE_SET.md
+++ b/doc/FEATURE_SET.md
@@ -58,8 +58,11 @@ TDD UL: 5 MHz, 25 PRBS/ MCS **XX**   | 2.0 Mbit/s          | TM1: 1.66 Mbits/s
 TDD UL: 10 MHz, 50 PRBS/ MCS **XX**  | 2.0 Mbit/s          | TM1: 1.89 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
 TDD UL: 20 MHz, 100 PRBS/ MCS **XX** | 3.0 Mbit/s          | TM1: 2.70 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
 
-- Number of supported UEs: 16 by default, up to 256 when compiling with dedicated compile flag
-                           Was tested with 40 COTS-UE
+### Number of supported UEs ###
+
+* 16 by default
+* up to 256 when compiling with dedicated compile flag
+* was tested with 40 COTS-UE
 
 ## eNB MAC Layer ##