diff --git a/include/rosa/agent/Abstraction.hpp b/include/rosa/agent/Abstraction.hpp
index 2b00755..cb24119 100644
--- a/include/rosa/agent/Abstraction.hpp
+++ b/include/rosa/agent/Abstraction.hpp
@@ -1,225 +1,238 @@
 //===-- rosa/agent/Abstraction.hpp ------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/Abstraction.hpp
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
 /// \brief Definition of *abstraction* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_ABSTRACTION_HPP
 #define ROSA_AGENT_ABSTRACTION_HPP
 
 #include "rosa/agent/Functionality.h"
 
 #include "rosa/support/debug.hpp"
 
 #include <algorithm>
 #include <map>
 
 namespace rosa {
 namespace agent {
 
 /// Abstracts values from a type to another one.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A> class Abstraction : public Functionality {
 protected:
   /// Value to abstract to by default.
   const A Default;
 public:
   /// Creates an instance.
   ///
   /// \param Default value to abstract to by default
   Abstraction(const A Default) noexcept : Default(Default) {}
 
   /// Destroys \p this object.
   ~Abstraction(void) = default;
 
   /// Checks wether the Abstraction evaluates to default at the given position
+  ///
+  /// \param v the value at which to check if the function falls back to it's
+  /// default value.
+  /// \return true, the default implementation always falls back to the default
+  /// value
   virtual bool isDefaultAt(const T &V) const noexcept{
     (void)V;
 	return true;
   }
 
   /// Abstracts a value from type \p T to type \p A.
   ///
   /// \note The default implementation always returns
   /// \c rosa::agent::Abstraction::Default, hence the actual argument is
   /// ignored.
   ///
   /// \return the abstracted value
   virtual A operator()(const T &) const noexcept { return Default; }
 };
 
 /// Implements \c rosa::agent::Abstraction as a \c std::map from a type to
 /// another one.
 ///
 /// \note This implementation is supposed to be used to abstract between
 /// enumeration types, which is statically enforced.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A>
 class MapAbstraction : public Abstraction<T, A>, private std::map<T, A> {
   // Make sure the actual type arguments are enumerations.
   STATIC_ASSERT((std::is_enum<T>::value && std::is_enum<A>::value),
                 "mapping not enumerations");
 
   // Bringing into scope inherited members.
   using Abstraction<T, A>::Default;
   using std::map<T, A>::end;
   using std::map<T, A>::find;
 
 public:
   /// Creates an instance by initializing the underlying \c std::map.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default value to abstract to by default
   MapAbstraction(const std::map<T, A> &Map, const A Default) noexcept
       : Abstraction<T, A>(Default),
         std::map<T, A>(Map) {}
 
   /// Destroys \p this object.
   ~MapAbstraction(void) = default;
 
   /// Checks wether the Abstraction evaluates to default at the given position
+  ///
+  /// \param v the value at which to check if the function falls back to it's
+  /// default value.
+  /// \return true if the Abstraction falls back to the default value
   bool isDefaultAt(const T &V) const noexcept override {
     const auto I = find(V);
     return I == end() ? true : false;
   }
   
   /// Abstracts a value from type \p T to type \p A based on the set mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::MapAbstraction::Default if the actual argument is not
   /// associated with anything by the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   A operator()(const T &V) const noexcept override {
     const auto I = find(V);
     return I == end() ? Default : *I;
   }
 };
 
 /// Implements \c rosa::agent::Abstraction as a \c std::map from ranges of a
 /// type to values of another type.
 ///
 /// \note This implementation is supposed to be used to abstract ranges of
 /// arithmetic types into enumerations, which is statically enforced.
 ///
 /// \invariant The keys in the underlying \c std::map define valid ranges
 /// such that `first <= second` and there are no overlapping ranges defined by
 /// the keys.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A>
 class RangeAbstraction : public Abstraction<T, A>,
                          private std::map<std::pair<T, T>, A> {
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<T>::value), "abstracting not arithmetic");
   /// \todo check if this compiles with the definition of abstractions as
   /// self-aware properties
   //STATIC_ASSERT((std::is_enum<A>::value), "abstracting not to enumeration");
 
   // Bringing into scope inherited members.
   using Abstraction<T, A>::Default;
   using std::map<std::pair<T, T>, A>::begin;
   using std::map<std::pair<T, T>, A>::end;
   using std::map<std::pair<T, T>, A>::find;
 
 public:
   /// Creates an instance by Initializing the unserlying \c std::map.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default value to abstract to by default
   ///
   /// \pre Each key defines a valid range such that `first <= second` and
   /// there are no overlapping ranges defined by the keys.
   RangeAbstraction(const std::map<std::pair<T, T>, A> &Map, const A &Default)
       : Abstraction<T, A>(Default), std::map<std::pair<T, T>, A>(Map) {
     // Sanity check.
     ASSERT(std::all_of(
         begin(), end(), [this](const std::pair<std::pair<T, T>, A> &P) {
           return P.first.first <= P.first.second &&
                  std::all_of(++find(P.first), end(),
                              [&P](const std::pair<std::pair<T, T>, A> &R) {
                                // \note Values in \c Map are sorted.
                                return P.first.first < P.first.second &&
                                           P.first.second <= R.first.first ||
                                       P.first.first == P.first.second &&
                                           P.first.second < R.first.first;
                              });
         }));
   }
 
   /// Destroys \p this object.
   ~RangeAbstraction(void) = default;
 
   /// Checks wether the Abstraction evaluates to default at the given position
+  ///
+  /// \param v the value at which to check if the function falls back to it's
+  /// default value.
+  /// \return true if the Abstraction falls back to the default value
   bool isDefaultAt(const T &V) const noexcept override {
     auto I = begin();
     bool Found = false;  // Indicates if \c I refers to a matching range.
     bool Failed = false; // Indicates if it is pointless to continue searching.
     while (!Found && !Failed && I != end()) {
       if (V < I->first.first) {
         // No match so far and \p V is below the next range, never will match.
         // \note Keys are sorted in the map.
         return true;
       } else if (I->first.first <= V && V < I->first.second) {
         // Matching range found.
         return false;
       } else {
         // Cannot conclude in this step, move to the next range.
         ++I;
       }
     }
     return true;
   }
 
   /// Abstracts a value from type \p T to type \p A based on the set mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::RangeAbstraction::Default if the actual argument is not
   /// included in any of the ranges in the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   A operator()(const T &V) const noexcept override {
     auto I = begin();
     bool Found = false;  // Indicates if \c I refers to a matching range.
     bool Failed = false; // Indicates if it is pointless to continue searching.
     while (!Found && !Failed && I != end()) {
       if (V < I->first.first) {
         // No match so far and \p V is below the next range, never will match.
         // \note Keys are sorted in the map.
         Failed = true;
       } else if (I->first.first <= V && V < I->first.second) {
         // Matching range found.
         Found = true;
       } else {
         // Cannot conclude in this step, move to the next range.
         ++I;
       }
     }
     ASSERT(!Found || I != end());
     return Found ? I->second : Default;
   }
 };
 
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_ABSTRACTION_HPP
diff --git a/include/rosa/agent/FunctionAbstractions.hpp b/include/rosa/agent/FunctionAbstractions.hpp
index 2ea645e..468d85d 100644
--- a/include/rosa/agent/FunctionAbstractions.hpp
+++ b/include/rosa/agent/FunctionAbstractions.hpp
@@ -1,223 +1,224 @@
 //===-- rosa/agent/FunctionAbstractions.hpp ---------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/FunctionAbstractions.hpp
 ///
 /// \author Benedikt Tutzer (benedikt.tutzer@tuwien.ac.at)
 ///
 /// \date 2019
 ///
 /// \brief Definition of *FunctionAbstractions* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_FUNCTIONABSTRACTIONS_HPP
 #define ROSA_AGENT_FUNCTIONABSTRACTIONS_HPP
 
 #include "rosa/agent/Functionality.h"
 #include "rosa/agent/Abstraction.hpp"
 
 #include "rosa/support/debug.hpp"
 
 #include <algorithm>
 #include <vector>
 #include <cmath>
 #include <memory>
 
 namespace rosa {
 namespace agent {
 
 /// Implements \c rosa::agent::Abstraction as a linear function,
 /// y = Coefficient * X + Intercept.
 ///
 /// \note This implementation is supposed to be used to represent a linear
 /// function from an arithmetic domain to an arithmetic range. This is enforced
 /// statically.
 ///
 /// \tparam D type of the functions domain
 /// \tparam R type of the functions range
 template <typename D, typename R> class LinearFunction :
 	public Abstraction<D, R>{
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<D>::value),
     "LinearFunction not arithmetic T");
   STATIC_ASSERT((std::is_arithmetic<R>::value),
     "LinearFunction not to arithmetic");
 protected:
   /// The Intercept of the linear function
   const D Intercept;
   /// The Coefficient of the linear function
   const D Coefficient;
 
 public:
   /// Creates an instance.
   ///
   /// \param Intercept the intercept of the linear function
   /// \param Coefficient the coefficient of the linear function
   LinearFunction(D Intercept, D Coefficient) noexcept
       : Abstraction<D, R>(Intercept),
         Intercept(Intercept),
         Coefficient(Coefficient) {}
 
   /// Destroys \p this object.
   ~LinearFunction(void) = default;
 
   /// Checks wether the Abstraction evaluates to default at the given position
   /// As LinearFunctions can be evaluated everythwere, this is always false
   ///
   /// \param V the value at which to check if the function falls back to it's
   /// default value.
   ///
   /// \return false
   bool isDefaultAt(const D &V) const noexcept override {
     (void)V;
     return false;
   }
 
   /// Evaluates the linear function
   ///
   /// \param X the value at which to evaluate the function
   ///
   /// \return Coefficient*X + Intercept
   virtual R operator()(const D &X) const noexcept override {
     return Intercept + X*Coefficient;
   }
 };
 
 /// Implements \c rosa::agent::Abstraction as a sine function,
 /// y = Amplitude * sin(Frequency * X + Phase) + Average.
 ///
 /// \note This implementation is supposed to be used to represent a sine
 /// function from an arithmetic domain to an arithmetic range. This is enforced
 /// statically.
 ///
 /// \tparam D type of the functions domain
 /// \tparam R type of the functions range
 template <typename D, typename R> class SineFunction :
 	public Abstraction<D, R>{
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<D>::value),
     "SineFunction not arithmetic T");
   STATIC_ASSERT((std::is_arithmetic<R>::value),
     "SineFunction not to arithmetic");
 protected:
   /// The frequency of the sine wave
   const D Frequency;
   /// The Ampiltude of the sine wave
   const D Amplitude;
   /// The Phase-shift of the sine wave
   const D Phase;
   /// The y-shift of the sine wave
   const D Average;
 
 public:
   /// Creates an instance.
   ///
   /// \param Frequency the frequency of the sine wave
   /// \param Amplitude the amplitude of the sine wave
   /// \param Phase the phase of the sine wave
   /// \param Average the average of the sine wave
   SineFunction(D Frequency, D Amplitude, D Phase, D Average) noexcept
       : Abstraction<D, R>(Average),
         Frequency(Frequency),
         Amplitude(Amplitude),
         Phase(Phase),
         Average(Average) {}
 
   /// Destroys \p this object.
   ~SineFunction(void) = default;
 
   /// Checks wether the Abstraction evaluates to default at the given position
   /// As SineFunctions can be evaluated everythwere, this is always false
   ///
   /// \param V the value at which to check if the function falls back to it's
   /// default value.
   ///
   /// \return false
   bool isDefaultAt(const D &V) const noexcept override {
     (void)V;
     return false;
   }
 
   /// Evaluates the sine function
   ///
   /// \param X the value at which to evaluate the function
   /// \return the value of the sine-function at X
   virtual R operator()(const D &X) const noexcept override {
     return Amplitude*sin(Frequency * X + Phase) + Average;
   }
 };
 /// Implements \c rosa::agent::Abstraction as a partial function from a domain
 // /to a range.
 ///
 /// \note This implementation is supposed to be used to represent a partial
 /// function from an arithmetic domain to an arithmetic range. This is enforced
 /// statically.
 ///
 /// A partial function is defined as a list of abstractions, where each
 /// abstraction is associated a range in which it is defined. These ranges must
 /// be mutually exclusive.
 ///
 /// \tparam D type of the functions domain
 /// \tparam R type of the functions range
 template <typename D, typename R>
 class PartialFunction : public Abstraction<D, R> {
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<D>::value), "abstracting not arithmetic");
   STATIC_ASSERT((std::is_arithmetic<R>::value),
       "abstracting not to arithmetic");
 
 private:
   /// A \c rosa::agent::RangeAbstraction RA is used to represent the association
   /// from ranges to Abstractions.
   /// This returns the Abstraction that is defined for any given value, or
   /// a default Abstraction if no Abstraction is defined for that value.
   RangeAbstraction<D, std::shared_ptr<Abstraction<D, R>>> RA;
 
 public:
   /// Creates an instance by Initializing the underlying \c Abstraction.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default abstraction to abstract to by default
   ///
   /// \pre Each key defines a valid range such that `first <= second` and
   /// there are no overlapping ranges defined by the keys.
   PartialFunction(const std::map<std::pair<D, D>,
       std::shared_ptr<Abstraction<D, R>>> &Map,
     const R Default)
       : Abstraction<D, R>(Default),
         RA(Map, std::shared_ptr<Abstraction<D, R>>
           (new Abstraction<D, R>(Default))) {
   }
 
   /// Destroys \p this object.
   ~PartialFunction(void) = default;
 
   /// Checks wether the Abstraction evaluates to default at the given position
   ///
   /// \param V the value at which to check if the function falls back to it's
   /// default value.
   ///
-  /// \return false
+  /// \return false if the value falls into a defined range and the Abstraction
+  /// defined for that range does not fall back to it's default value.
   bool isDefaultAt(const D &V) const noexcept override {
     return RA.isDefaultAt(V) ? true : RA(V)->isDefaultAt(V);
   }
 
   /// Searches for an Abstraction for the given value and executes it for that
   /// value, if such an Abstraction is found. The default Abstraction is
   /// evaluated otherwise.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   R operator()(const D &V) const noexcept override {
     return RA(V)->operator()(V);
   }
 };
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_FUNCTIONABSTRACTIONS_HPP