diff --git a/Doc/UserManual/CMakeLists.txt b/Doc/UserManual/CMakeLists.txt
index 78180ad91a2901f39c0a554999191990b5ff6a5e..bfc5f75c68153f9a89e59aa1acd6a1d3cdab9251 100644
--- a/Doc/UserManual/CMakeLists.txt
+++ b/Doc/UserManual/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(BornAgainManual NONE)
 
 # version is read from main directory,
-# and written to cmake/scripts/UserManualVersion.tex.in
+# and written to cmake/bornagain/scripts/UserManualVersion.tex.in
 include( ../../VERSION.cmake )
 
 if(POLICY CMP0046)
@@ -15,25 +15,26 @@ set(LATEX_COMPILER_FLAGS "-interaction=errorstopmode" CACHE STRING "Flags passed
 if(BORNAGAIN_USERMANUAL)
     # --- configure a header file to pass CMake settings to the source code
     configure_file(
-        "${CMAKE_SOURCE_DIR}/cmake/scripts/UserManualVersion.tex.in"
+        "${CMAKE_SOURCE_DIR}/cmake/bornagain/scripts/UserManualVersion.tex.in"
         "${CMAKE_SOURCE_DIR}/Doc/UserManual/UserManualVersion.tex"
     )
-    include(${CMAKE_MODULE_PATH}/UseLATEX.cmake)
+    include(UseLATEX)
 
 else()
     # to compile in standalone mode
     configure_file(
-        "${CMAKE_SOURCE_DIR}/../../cmake/scripts/UserManualVersion.tex.in"
+        "${CMAKE_SOURCE_DIR}/../../cmake/bornagain/scripts/UserManualVersion.tex.in"
         "${CMAKE_SOURCE_DIR}/../../Doc/UserManual/UserManualVersion.tex"
     )
-    include(../../cmake/modules/UseLATEX.cmake)
+    include("../../cmake/modules/UseLATEX.cmake")
 
 endif()
 
 file(GLOB tex_inputs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.tex)
 file(GLOB fig_inputs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} fig/[a-z]*/*)
 
-ADD_LATEX_DOCUMENT(BornAgainManual.tex
+ADD_LATEX_DOCUMENT(
+    BornAgainManual.tex
     INPUTS ${tex_inputs} ${fig_inputs}
     BIBFILES jw7.bib
     USE_INDEX
diff --git a/Doc/UserManual/Usage.tex b/Doc/UserManual/Usage.tex
index 69e98e3b3202a56f3119f6bdfe3183d7f1bae826..d83da4839cae7a1f462c36f794f737e8e9c1fc26 100644
--- a/Doc/UserManual/Usage.tex
+++ b/Doc/UserManual/Usage.tex
@@ -516,4 +516,4 @@ The complete example described in this section can be found at
 
 \section{UNDER CONSTRUCTION}
 
-\PyImport{simulation/ex01_BasicParticles/AllFormFactorsAvailable.py}
+%\PyImport{simulation/ex01_BasicParticles/AllFormFactorsAvailable.py}
diff --git a/Doc/UserManual/UserManualVersion.tex b/Doc/UserManual/UserManualVersion.tex
index 98a691c01b84a91e59c00057fee8e61f56b082ca..96aba94deb3fda620a52b101350927d9658b79db 100644
--- a/Doc/UserManual/UserManualVersion.tex
+++ b/Doc/UserManual/UserManualVersion.tex
@@ -4,4 +4,4 @@
 % using cmake/scripts/UserManualVersion.tex.in
 
 \newcommand{\UserManualVersionNumber}
-{1.5.99}
+{1.6.99}
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
index 94ffd5f2ce38c28b830a916af951d5b67888802a..f98250f03ab158c37653d2bf35ee5d4882c9e5e3 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
@@ -140,7 +140,8 @@ void FitSuiteWidget::startFitting()
 
     try {
         qDebug() << " try run fitting";
-        m_observer->setInterval(m_currentItem->fitSuiteItem()->getItemValue(FitSuiteItem::P_UPDATE_INTERVAL).toInt());
+        m_observer->setInterval(m_currentItem->fitSuiteItem()->getItemValue(
+                                    FitSuiteItem::P_UPDATE_INTERVAL).toInt());
         std::shared_ptr<FitSuite> fitSuite(DomainFittingBuilder::createFitSuite(m_currentItem));
         fitSuite->attachObserver(m_observer);
         m_runFitManager->setFitSuite(fitSuite);
@@ -193,7 +194,8 @@ void FitSuiteWidget::onFittingFinished()
 void FitSuiteWidget::onFitSuitePropertyChange(const QString &name)
 {
     if(name == FitSuiteItem::P_UPDATE_INTERVAL) {
-        m_observer->setInterval(m_currentItem->fitSuiteItem()->getItemValue(FitSuiteItem::P_UPDATE_INTERVAL).toInt());
+        m_observer->setInterval(m_currentItem->fitSuiteItem()->getItemValue(
+                                    FitSuiteItem::P_UPDATE_INTERVAL).toInt());
 
     }
 
@@ -209,7 +211,8 @@ void FitSuiteWidget::connectSignals()
 {
     connect(m_runFitManager, SIGNAL(startedFitting()), this, SLOT(onFittingStarted()));
     connect(m_runFitManager, SIGNAL(finishedFitting()), this, SLOT(onFittingFinished()));
-    connect(m_runFitManager, SIGNAL(fittingError(QString)), this, SLOT(processFittingError(QString)));
+    connect(m_runFitManager, SIGNAL(fittingError(QString)),
+            this, SLOT(processFittingError(QString)));
 
     connect(m_observer.get(), SIGNAL(plotsUpdate()), this, SLOT(onPlotsUpdate()));
 
@@ -247,8 +250,9 @@ void FitSuiteWidget::updateLog(const FitProgressInfo &info)
     FitParameterContainerItem *fitParContainer = m_currentItem->fitParameterContainerItem();
     int index(0);
     QVector<double> values = info.parValues();
-    foreach(SessionItem *item, fitParContainer->getItems(FitParameterContainerItem::T_FIT_PARAMETERS)) {
-        QString parinfo = QString("      %1 %2\n").arg(item->displayName()).arg(values[index]);
+    foreach(SessionItem *item,
+            fitParContainer->getItems(FitParameterContainerItem::T_FIT_PARAMETERS)) {
+        QString parinfo = QString("      %1 %2\n").arg(item->displayName()).arg(values[index++]);
         message.append(parinfo);
     }