diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/debuggees-object-storage.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/debuggees-object-storage.wiki
index 07926cc1..955a5489 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/debuggees-object-storage.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/debuggees-object-storage.wiki
@@ -3,18 +3,22 @@
 [[Property:uuid|b26fb1b0-85ef-26b5-9b9d-6e3b8ad977c2]]
 This command can be accessed through the context menu, and from the objects tool, and watches tools thanks to the tool bar's button [ [[Image:execution-object-storage-icon]] ]. 
 
-By Pick-and-Dropping a debuggee object onto the button [ [[Image:execution-object-storage-icon]] ], you raise the "save" dialog. Then you need to choose the target filename where we'll store the debuggee object. 
-
-<center> [[Image:debuggee-object-storage-save]]  </center>
-
-By clicking on a watch tool's button [ [[Image:execution-object-storage-icon]] ], you raise the "load" dialog. Then you need to select the filename which contain the debuggee object's storage. If the loading is successful, the retrieved object will be added in the related watch tool. <br/>
+By Pick-and-Dropping a debuggee object onto the button [ [[Image:execution-object-storage-icon]] ], you raise the "save" dialog. Then you need to choose the name for the file into which EiffelStudio will store the debuggee object. 
 
 
-<center> [[Image:debuggee-object-storage-load]]  </center>
+[[Image:debuggee-object-storage-save]] 
 
-{{tip|By Pick-and-Dropping an object onto the button, you can load the retrieved values into the dropped object (make sure it has same type).}}
 
-{{warning|For now this command is pretty basic, and provided as it is. The underlying implementation is using <code>{FILE}.independent_store and {FILE}.retrieved</code> for save and load operation, to load the value into an existing object, it is using <code>{ANY}.standard_copy (..)</code>. For details, you can have a look at the RT_EXTENSION_GENERAL code }}
+By clicking on Evaluation tool's button [ [[Image:execution-object-storage-icon]] ], you raise the "load" dialog. Then you need to select the name of the file which contains the debuggee object's storage. If the loading is successful, the retrieved object will be added in the related Evaluation tool. <br/>
+
+
+[[Image:debuggee-object-storage-load]] 
+
+
+{{tip|By Pick-and-Dropping an object onto the button, you can load the retrieved values into the dropped object (provided that both have the same type).}}
+
+
+{{caution|For now this command implements only basic functionality, and is provided as-is. The underlying implementation uses <code>{FILE}.independent_store</code> and <code>{FILE}.retrieved</code> for save and load operations. To load the value into an existing object, it uses <code>{ANY}.standard_copy (..)</code>. For details, you can have a look at the code in class <code>RT_EXTENSION_GENERAL</code>. }}
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/exceptions-handling-tool.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/exceptions-handling-tool.wiki
index e2c313a5..f8628de4 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/exceptions-handling-tool.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/exceptions-handling-tool.wiki
@@ -11,7 +11,7 @@ If the "filter exceptions" is enabled, for each exception you can leave the exce
 
 In the following picture, we stop on every exception except the "External Exception".
 
-<center> [[Image:exceptions-handling-tool|Exception handling tool]] </center>
+[[Image:exceptions-handling-tool|Exception handling tool]] 
 
 {{tip|Using the "Pattern" field, you can add you own filter using regular expression.}}
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/expression-evaluation/new-expression-dialog.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/expression-evaluation/new-expression-dialog.wiki
index 8539d7c1..97758794 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/expression-evaluation/new-expression-dialog.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/expression-evaluation/new-expression-dialog.wiki
@@ -14,8 +14,8 @@ context: As object
 
 
 The first part in the dialog makes it possible to select the context of the expression. 
-*  The default context is the context of the [[Information relative to a stack element|currently selected call stack element]]. This context gives access to the locals, the arguments, the result and the enclosing object features. 
-*  The object context, that requires a valid object address, gives access to the features of the selected object. If you select "As object", the result of the expression is the referenced object itself; and you can supply a name for the object (see the second screenshot). 
+*  The default context is the context of the [[Information relative to a stack element|currently selected call stack element]], as shown in the left image above. This context gives access to the locals, the arguments, the result and the enclosing object features. 
+*  The object context, that requires a valid object address, gives access to the features of the selected object. If you select "As object", the result of the expression is the referenced object itself; and you can supply a name for the object, as depicted in the right image above. 
 *  The last context, the class-related context, gives access to the <code>once</code> and constant features of that class. It requires a valid class name. 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/threads-tool.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/threads-tool.wiki
index 6047bbeb..8829d301 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/threads-tool.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/threads-tool.wiki
@@ -1,10 +1,18 @@
 [[Property:title|Threads tool]]
 [[Property:weight|-8]]
 [[Property:uuid|457b71dc-4609-dac1-8458-cd9b64fd5945]]
-This tool displays the list of current Eiffel '''threads'''. <br/>
-To show this tool, go to menu : '''Debug > Tools > Threads''' .
- [[Image:threads-tool|Threads tool]]  
-By double clicking on a row, you change the current thread for the debuggee (application). If you double click on "Note" cell, you can edit a note, this can be useful to identify a thread during the debugging session.<br/>
+This tool displays the list of current Eiffel threads. <br/>
+To show this tool, use the menu path: 
+<code lang=text>
+Debug --> Tools --> Threads </code>
+
+
+[[Image:threads-tool|Threads tool]]  
+
+
+By double clicking on a row, you change the current thread for the debuggee (application). If you double click on "Note" cell, you can edit a note, this can be useful to identify a thread during the debugging session.
+
+
 The highlighted line shows the current thread.