moved Andrea's text as a comment for comparison reasons to the main doc (out of the figure); fixed merge-conflicts