diff --git a/document/chapters/chapter_5/sections/2_solution_analysis.tex b/document/chapters/chapter_5/sections/2_solution_analysis.tex
index 37cad53..9631ed7 100644
--- a/document/chapters/chapter_5/sections/2_solution_analysis.tex
+++ b/document/chapters/chapter_5/sections/2_solution_analysis.tex
@@ -59,12 +59,12 @@ \subsection{Domain: Ubiquitous Language}\label{ubiquitous_language}
     \item \textbf{Invoking Device}\label{invoking_device}\\
     A device that runs the \textit{Customer Custom Application}. Such device can be owned by the \textit{Customer} itself or by people using the \textit{Customer Custom Application} that the \textit{Customer} is commercializing. In regard to the \textit{Grid}, the focal point here is that it is a device that is performing a \textit{Grid Service Invocation} through the \textit{Customer Custom Application} that is utilizing the \textit{Invoking Endpoint} software.
     \item \textbf{Customer Custom Application User}\label{customer_custom_application_user}\\
-    TODO
+    End user of the \textit{Customer Custom Application}. The \textit{Customer} and the \textit{Customer Custom Application User} can coincide, but it highly depends on the specific \textit{Customer Custom Application} developed by the \textit{Customer}.
     \item \textbf{Contributor Dashboard}\label{contributor_dashboard}\\
     A software entity through which a \textit{Contributor} can manage its \textit{Contributing Endpoints} and check its \textit{Rewards Balance} (eventually performing a \textit{Rewards Redemption}).
     \item \textbf{Customer Dashboard}\label{customer_dashboard}\\
-    A software entity through which a \textit{Customer} can manage its present and past \textit{Grid Service Invocations} and check the relative \textit{Fees} as well as registering a payment method used to pay such \textit{Fees}.
-    \item \textbf{MapReduce Service}\label{mapreduce_service}\\
+    A software entity through which a \textit{Customer} can manage its present and past \textit{Grid Service Invocations}, check the relative \textit{Fees} as well as registering a payment method.
+    \item \textbf{MapReduce Service}\label{mapreduce_service_ul}\\
     A particular incarnation of a \textit{Grid Service} that performs a MapReduce computation over the \textit{Grid} utilizing a \textit{Node} as \textit{MapReduce Master} and several nodes as \textit{Map Workers} and \textit{Reduce Workers}.
     \item \textbf{MapReduce Master}\label{mapreduce_master}\\
     Role taken by a \textit{Node} in the execution of a \textit{MapReduce Service}. Its roles follow the ones described in \textit{section \ref{execution_flow}}.
@@ -83,7 +83,7 @@ \subsection{Domain: Ubiquitous Language}\label{ubiquitous_language}
     \item \textbf{Rewards Balance}\label{rewards_balance}\\
     The sum of the \textit{Rewards} obtained by the \textit{Contributor} for the \textit{Contribution} of the \textit{Contributing Endpoints} owned by it. This balance can be lowered when the \textit{Contributor} performs a \textit{Rewards Redemption}. 
     \item \textbf{Rewards Redemption}\label{rewards_redemption}\\
-    An action performable by the \textit{Contributor} (only if the \textit{Rewards Balance} is currently higher or equal to the \textit{Rewards Threshold}) that lowers the value of the \textit{Rewards Balance} allowing the \textit{Contributor} to transfer that monetary value by using a payment method.
+    An action performable, by the \textit{Contributor} (only if the \textit{Rewards Balance} is currently higher or equal to the \textit{Rewards Threshold}), that lowers the value of the \textit{Rewards Balance} transfering that monetary value by using a payment method.
     \item \textbf{Rewards Threshold}\label{rewards_threshold}\\
     The value that needs to be reached in order to allow the \textit{Contributor} the possibility to perform a \textit{Rewards Redemption}.
     \item \textbf{Access Policies}\label{access_policies}\\