diff --git a/README.md b/README.md
index defcb1a5..745de934 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ Key features:
 ![](./images/banners/screenshots.png)
 
 # Getting Started
-  * [Deployment on Kubernetes](./docs/deployement-on-kubernetes.md)
-  * [Deployment on Docker](./docs/deployement-on-deployment-on-docker.md)
+  * [Deployment on Kubernetes](./docs/deployment-on-kubernetes.md)
+  * [Deployment on Docker](./docs/deployment-on-docker.md)
   * [Integration with Kubernetes](https://realopinsight.com/docs/quickstart-kubernetes-dashboard/)
   * [Integration with Zabbix](https://realopinsight.com/docs/quickstart-zabbix-dashboard/)
   * [Integration with Nagios and alike](https://realopinsight.com/docs/quickstart-nagios-icinga-centreon-dashboard/)
diff --git a/contribs/etc/wt_config.xml b/contribs/etc/wt_config.xml
index d3d6d006..79abb6bd 100644
--- a/contribs/etc/wt_config.xml
+++ b/contribs/etc/wt_config.xml
@@ -29,7 +29,7 @@
             <!-- Every session runs within a dedicated process.
 
 	       This mode guarantees kernel-level session privacy, but as every
-	       session requires a seperate process, it is also an easy target
+	       session requires a separate process, it is also an easy target
 	       for DoS attacks if not shielded by access control.
 
                It is also a convenient mode during development, as it is easy
@@ -56,7 +56,7 @@
 	       session will kill all of the sessions in the same process. You
 	       should debug extensively using valgrind. Also, it is your
 	       responsibility to keep session state not interfering and
-	       seperated.
+	       separated.
 
 	       On the other hand, sessions are inexpensive, and this mode
 	       suffers far less from DoS attacks than dedicated-process mode.
@@ -116,7 +116,7 @@
 	       will be started for every shared process, or for every session
 	       which has ?debug appended to the command line.
 
-	       The variable is slighly misnamed. Not only a path can be set,
+	       The variable is slightly misnamed. Not only a path can be set,
 	       but also options, like for example:
 
                  /usr/bin/valgrind - -leak-check=full
@@ -135,7 +135,7 @@
                want to change this value if you would like to support
                reentrant event loops, where you block one event loop
                using WDialog::exec() or related static
-               methods. Everytime you enter such an event loop, one
+               methods. Every time you enter such an event loop, one
                thread is blocked, and therefore the total number of
                sessions that reliably can do this is limited to the
                number of thread you have (minus one to unblock).
@@ -169,7 +169,7 @@
                You may want to change this value if you would like to
                support more reentrant event loops, where you block one
                event loop using WDialog::exec() or related static
-               methods. Everytime you enter such an event loop, one
+               methods. Every time you enter such an event loop, one
                thread is blocked, and therefore the total number of
                sessions that reliably can do this is limited to the
                number of thread you have (minus one to unblock).
@@ -207,7 +207,7 @@
 	    <max-memory-request-size>1024</max-memory-request-size>
 	</connector-isapi>
 
-        <!-- Javascript debug options
+        <!-- JavaScript debug options
 
 	     Values:
 	     - true: JavaScript errors are not caught but the browser
@@ -281,7 +281,7 @@
 	   how quickly they are generated.
 
 	   In rare cases, the scheme may result in unwanted behaviour,
-	   because the client-side is allowed to be slighly out of
+	   because the client-side is allowed to be slightly out of
 	   sync at the time an event is recorded with the server-side
 	   (and more so on high-latency links). The drastic
 	   alternative is to discard events while a response is
@@ -336,7 +336,7 @@
 
 	<!-- Whether inline CSS is allowed.
 
-           Some Wt widgets will insert CSS rules in the the inline
+           Some Wt widgets will insert CSS rules in the inline
            stylesheet when first used. This can be disabled using this
 	   configuration option.
 
@@ -445,7 +445,7 @@
 
             <!-- resourcesURL property
 
-	       The URL at which the resources/ folder is deploeyd that
+	       The URL at which the resources/ folder is deployed that
 	       comes distributed with Wt and contains auxiliary files
 	       used to primarily for styles and themes.
 
diff --git a/core/src/Base.hpp b/core/src/Base.hpp
index 084511e4..0857fe97 100644
--- a/core/src/Base.hpp
+++ b/core/src/Base.hpp
@@ -282,7 +282,7 @@ struct ThresholdT {
   int sev_out;
 };
 
-struct ThresholdLessthanFnt {
+struct ThresholdLessThanFnt {
   bool operator () (const ThresholdT& th1, const ThresholdT& th2)
   {
     if (th1.sev_out < th2.sev_out)
diff --git a/core/src/DashboardBase.cpp b/core/src/DashboardBase.cpp
index d02d58a7..c9817fc7 100644
--- a/core/src/DashboardBase.cpp
+++ b/core/src/DashboardBase.cpp
@@ -147,7 +147,7 @@ void DashboardBase::signalUpdateProcessing(const SourceT& src)
 {
   QString monitorName = MonitorT::toString(src.mon_type);
   if (src.mon_type == MonitorT::Nagios) {
-    Q_EMIT updateMessageChanged(QObject::tr("quering %1/%2 => %3:%4...").arg(monitorName, src.id, src.ls_addr, QString::number(src.ls_port)).toStdString());
+    Q_EMIT updateMessageChanged(QObject::tr("querying %1/%2 => %3:%4...").arg(monitorName, src.id, src.ls_addr, QString::number(src.ls_port)).toStdString());
   } else {
     Q_EMIT updateMessageChanged(QObject::tr("querying %1/%2 => %3)...").arg(monitorName, src.id, src.mon_url).toStdString());
   }
diff --git a/core/src/K8sHelper.cpp b/core/src/K8sHelper.cpp
index b3ebeb80..6280afc5 100644
--- a/core/src/K8sHelper.cpp
+++ b/core/src/K8sHelper.cpp
@@ -119,7 +119,7 @@ std::pair<QStringList, int> K8sHelper::listNamespaces(void)
     }
   }
 
-  // make request and conncet to the processing handlers
+  // make request and connect to the processing handlers
   QNetworkReply* reply = QNetworkAccessManager::get(req);
   connect(reply, SIGNAL(finished()), &m_eventLoop, SLOT(quit()));
   connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(exitEventLoop(QNetworkReply::NetworkError)));
@@ -162,7 +162,7 @@ std::pair<QByteArray, int> K8sHelper::requestNamespacedItemsData(const QString&
     }
   }
 
-  // make request and conncet to the processing handlers
+  // make request and connect to the processing handlers
   QNetworkReply* reply = QNetworkAccessManager::get(req);
   connect(reply, SIGNAL(finished()), &m_eventLoop, SLOT(quit()));
   connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(exitEventLoop(QNetworkReply::NetworkError)));
@@ -212,7 +212,7 @@ std::pair<QStringList, int> K8sHelper::parseNamespaces(const QByteArray& data)
 
 
 std::pair<QString, int> K8sHelper::parseNamespacedServices(const QByteArray& in_data,
-                                                           const QString& in_macthNamespace,
+                                                           const QString& in_matchNamespace,
                                                            QMap<QString, QMap<QString, QString>>& out_selectorMaps,
                                                            NodeListT& out_bpnodes)
 {
@@ -237,8 +237,8 @@ std::pair<QString, int> K8sHelper::parseNamespacedServices(const QByteArray& in_
     auto&& metaData = serviceData["metadata"].toObject();
     auto&& k8sNamespace = metaData["namespace"].toString();
 
-    // escape service if not matches the given namespac
-    if (k8sNamespace != in_macthNamespace) {
+    // escape service if not matches the given namespace
+    if (k8sNamespace != in_matchNamespace) {
       continue;
     }
 
@@ -450,7 +450,7 @@ std::tuple<int,  std::string, std::string> K8sHelper::extractStateInfo(const QJs
 
   // default state is "waiting"
   // See Kubernetes documentation: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#containerstate-v1-core
-  return std::make_tuple(ngrt4n::K8sPending, "", QObject::tr("container is wating").toStdString());
+  return std::make_tuple(ngrt4n::K8sPending, "", QObject::tr("container is waiting").toStdString());
 }
 
 
diff --git a/core/src/K8sHelper.hpp b/core/src/K8sHelper.hpp
index e00c8ed5..029b91bc 100644
--- a/core/src/K8sHelper.hpp
+++ b/core/src/K8sHelper.hpp
@@ -44,7 +44,7 @@ class K8sHelper : public QNetworkAccessManager
   std::pair<QStringList, int> parseNamespaces(const QByteArray& data);
 
   std::pair<QString, int> parseNamespacedServices(const QByteArray& in_data,
-                                                  const QString& in_macthNamespace,
+                                                  const QString& in_matchNamespace,
                                                   QMap<QString, QMap<QString, QString>>& out_selectorMaps,
                                                   NodeListT& out_bpnodes);
 
diff --git a/core/src/Parser.cpp b/core/src/Parser.cpp
index c822ce16..68e51849 100644
--- a/core/src/Parser.cpp
+++ b/core/src/Parser.cpp
@@ -54,7 +54,7 @@ Parser::~Parser()
 
 int Parser::processRenderingData(void)
 {
-  fixupVisilityAndDependenciesGraph();
+  fixupVisibilityAndDependenciesGraph();
   saveCoordinatesFile();
   return computeCoordinates();
 }
@@ -113,7 +113,7 @@ std::pair<int, QString> Parser::parse(const QString& viewFile)
     if (node.sev_crule == CalcRules::WeightedAverageWithThresholds) {
       QString thdata = xmlNode.firstChildElement("Thresholds").text().trimmed();
       node.thresholdLimits = ThresholdHelper::dataToList(thdata);
-      std::sort(node.thresholdLimits.begin(), node.thresholdLimits.end(), ThresholdLessthanFnt());
+      std::sort(node.thresholdLimits.begin(), node.thresholdLimits.end(), ThresholdLessThanFnt());
     }
 
     node.check.status = -1;
@@ -198,7 +198,7 @@ QString Parser::escapeId4Graphviz(const QString& id)
 
 
 
-void Parser::fixupVisilityAndDependenciesGraph(void)
+void Parser::fixupVisibilityAndDependenciesGraph(void)
 {
   m_dotContent = "\n";
 
@@ -282,25 +282,25 @@ int Parser::computeCoordinates(void)
   }
 
   //start parsing
-  QTextStream coodFileStream(& qfile);
+  QTextStream coordFileStream(& qfile);
   QString line;
-  if(static_cast<void>(line = coodFileStream.readLine(0)), line.isNull()) {
+  if(static_cast<void>(line = coordFileStream.readLine(0)), line.isNull()) {
     m_lastErrorMsg = QObject::tr("Failed to read file: %1").arg(m_plainFile);
     return ngrt4n::RcGenericFailure;
   }
 
   QRegExp regexSep("[ ]+");
-  QStringList splitedLine = line.split (regexSep);
-  if (splitedLine.size() != 4 || splitedLine[0] != "graph") {
+  QStringList splitLine = line.split (regexSep);
+  if (splitLine.size() != 4 || splitLine[0] != "graph") {
     m_lastErrorMsg = QObject::tr("Invalid graphviz entry: %1").arg(line);
     return ngrt4n::RcGenericFailure;
   }
 
   const ScaleFactors SCALE_FACTORS(settings.getGraphLayout());
   m_cdata->graph_mode = static_cast<qint8>(settings.getGraphLayout());
-  auto maxWidthRaw = splitedLine[2].trimmed().toDouble();
+  auto maxWidthRaw = splitLine[2].trimmed().toDouble();
   m_cdata->map_width = maxWidthRaw * SCALE_FACTORS.x() + NEATO_X_TRANSLATION_FACTOR * maxWidthRaw;
-  m_cdata->map_height = splitedLine[3].trimmed().toDouble() * SCALE_FACTORS.y();
+  m_cdata->map_height = splitLine[3].trimmed().toDouble() * SCALE_FACTORS.y();
   m_cdata->min_x = 0;
   m_cdata->min_y = 0;
   double max_text_w = 0;
@@ -309,18 +309,18 @@ int Parser::computeCoordinates(void)
   int x_index = 2;
   int y_index = 3;
 
-  while (static_cast<void>(line = coodFileStream.readLine(0)), ! line.isNull()) {
-    splitedLine = line.split (regexSep);
-    if (splitedLine[0] == "node") {
+  while (static_cast<void>(line = coordFileStream.readLine(0)), ! line.isNull()) {
+    splitLine = line.split (regexSep);
+    if (splitLine[0] == "node") {
       NodeListT::Iterator node;
-      QString nid = splitedLine[1].trimmed();
+      QString nid = splitLine[1].trimmed();
       if (ngrt4n::findNode(m_cdata, nid, node)) {
-        auto posXRaw = splitedLine[x_index].trimmed().toDouble();
+        auto posXRaw = splitLine[x_index].trimmed().toDouble();
         node->pos_x =  posXRaw * SCALE_FACTORS.x() + NEATO_X_TRANSLATION_FACTOR * posXRaw;
-        node->pos_y = splitedLine[y_index].trimmed().toDouble() * SCALE_FACTORS.y();
+        node->pos_y = splitLine[y_index].trimmed().toDouble() * SCALE_FACTORS.y();
 
-        node->text_w = splitedLine[4].trimmed().toDouble() * SCALE_FACTORS.x();
-        node->text_h = splitedLine[5].trimmed().toDouble() * SCALE_FACTORS.y();
+        node->text_w = splitLine[4].trimmed().toDouble() * SCALE_FACTORS.x();
+        node->text_h = splitLine[5].trimmed().toDouble() * SCALE_FACTORS.y();
 
         m_cdata->min_x = qMin<double>(m_cdata->min_x, node->pos_x);
         m_cdata->min_y = qMin<double>(m_cdata->min_y, node->pos_y);
@@ -328,10 +328,10 @@ int Parser::computeCoordinates(void)
         max_text_w = qMax(max_text_w, node->text_w);
         max_text_h = qMax(max_text_h, node->text_h);
       }
-    } else if (splitedLine[0] == "edge") {
-      // multiInsert because a node can have several childs
-      m_cdata->edges.insert(splitedLine[1], splitedLine[2]);
-    } else if (splitedLine[0] == "stop") {
+    } else if (splitLine[0] == "edge") {
+      // multiInsert because a node can have several children
+      m_cdata->edges.insert(splitLine[1], splitLine[2]);
+    } else if (splitLine[0] == "stop") {
       break;
     }
   }
diff --git a/core/src/Parser.hpp b/core/src/Parser.hpp
index 42aa18b3..a0d8be23 100644
--- a/core/src/Parser.hpp
+++ b/core/src/Parser.hpp
@@ -63,7 +63,7 @@ class Parser : public QObject
     DbSession* m_dbSession;
 
 
-    void fixupVisilityAndDependenciesGraph(void);
+    void fixupVisibilityAndDependenciesGraph(void);
     void saveCoordinatesFile(void);
     void insertITServiceNode(NodeT& node);
     std::pair<int, QString> loadDynamicViewByGroup(QDomNodeList& inXmlDomNodes, CoreDataT& outCData);
diff --git a/core/src/StatusAggregator.cpp b/core/src/StatusAggregator.cpp
index abb2e06c..98ad993d 100644
--- a/core/src/StatusAggregator.cpp
+++ b/core/src/StatusAggregator.cpp
@@ -57,7 +57,7 @@ void StatusAggregator::addSeverity(int value, double weight)
 void StatusAggregator::addThresholdLimit(QVector<ThresholdT>& thresholdsLimits, const ThresholdT& th)
 {
   thresholdsLimits.push_back(th);
-  std::sort(thresholdsLimits.begin(), thresholdsLimits.end(), ThresholdLessthanFnt());
+  std::sort(thresholdsLimits.begin(), thresholdsLimits.end(), ThresholdLessThanFnt());
 }
 
 
diff --git a/core/src/ZbxHelper.cpp b/core/src/ZbxHelper.cpp
index 4e2f7728..6489b994 100644
--- a/core/src/ZbxHelper.cpp
+++ b/core/src/ZbxHelper.cpp
@@ -276,7 +276,7 @@ int ZbxHelper::processGetApiVersionReply(void)
 
 int ZbxHelper::processTriggerData(ChecksT &checks)
 {
-  // check weird reponse
+  // check weird response
   qint32 tid = m_jsonData["id"].toInt();
 
   if (tid != GetTriggersByHostOrGroup && tid != GetTriggersByHostOrGroupV18 && tid != GetTriggersByIds)
diff --git a/core/src/utilsCore.cpp b/core/src/utilsCore.cpp
index 70abdfb1..fd461d88 100644
--- a/core/src/utilsCore.cpp
+++ b/core/src/utilsCore.cpp
@@ -38,24 +38,24 @@ QString ngrt4n::getAbsolutePath(const QString &_path)
 
 qint8 ngrt4n::severityFromProbeStatus(const int &monitorType, const int &statusValue)
 {
-  qint8 criticity = ngrt4n::Unknown;
+  qint8 criticality = ngrt4n::Unknown;
   if (monitorType == MonitorT::Nagios)
   {
     switch (statusValue)
     {
     case ngrt4n::NagiosOk:
-      criticity = ngrt4n::Normal;
+      criticality = ngrt4n::Normal;
       break;
     case ngrt4n::NagiosWarning:
-      criticity = ngrt4n::Major;
+      criticality = ngrt4n::Major;
       break;
     case ngrt4n::NagiosCritical:
-      criticity = ngrt4n::Critical;
+      criticality = ngrt4n::Critical;
       break;
     default:
       break;
     }
-    return static_cast<ngrt4n::SeverityT>(criticity);
+    return static_cast<ngrt4n::SeverityT>(criticality);
   }
 
   if (monitorType == MonitorT::Zabbix)
@@ -64,22 +64,22 @@ qint8 ngrt4n::severityFromProbeStatus(const int &monitorType, const int &statusV
     {
     case ngrt4n::ZabbixClear:
     case ngrt4n::ZabbixInfo:
-      criticity = ngrt4n::Normal;
+      criticality = ngrt4n::Normal;
       break;
     case ngrt4n::ZabbixWarn:
-      criticity = ngrt4n::Minor;
+      criticality = ngrt4n::Minor;
       break;
     case ngrt4n::ZabbixAverage:
-      criticity = ngrt4n::Major;
+      criticality = ngrt4n::Major;
       break;
     case ngrt4n::ZabbixHigh:
     case ngrt4n::ZabbixDisaster:
-      criticity = ngrt4n::Critical;
+      criticality = ngrt4n::Critical;
       break;
     default:
       break;
     }
-    return static_cast<ngrt4n::SeverityT>(criticity);
+    return static_cast<ngrt4n::SeverityT>(criticality);
   }
   
   if (monitorType == MonitorT::Kubernetes)
@@ -88,17 +88,17 @@ qint8 ngrt4n::severityFromProbeStatus(const int &monitorType, const int &statusV
     {
     case ngrt4n::K8sRunning:
     case ngrt4n::K8sSucceeded:
-      criticity = ngrt4n::Normal;
+      criticality = ngrt4n::Normal;
       break;
     case ngrt4n::K8sFailed:
-      criticity = ngrt4n::Critical;
+      criticality = ngrt4n::Critical;
       break;
     case ngrt4n::K8sPending:
     default:
-      criticity = ngrt4n::Unknown;
+      criticality = ngrt4n::Unknown;
       break;
     }
-    return static_cast<ngrt4n::SeverityT>(criticity);
+    return static_cast<ngrt4n::SeverityT>(criticality);
   }
 
   return ngrt4n::Unknown;
diff --git a/core/src/utilsCore.hpp b/core/src/utilsCore.hpp
index b03af7dc..4ce817a3 100644
--- a/core/src/utilsCore.hpp
+++ b/core/src/utilsCore.hpp
@@ -82,7 +82,7 @@ const IconMapT NodeIcons = {
     {"Database Server", "images/db-server.png"},
     {"Process", "images/process.png"},
     {"Logfile", "images/log.png"},
-    {"Network Bandwith", "images/network-usage.png"},
+    {"Network Bandwidth", "images/network-usage.png"},
     {"CPU", "images/cpu.png"},
     {"CPU Load", "images/performance-level.png"},
     {"Memory", "images/memory.png"},
@@ -164,7 +164,7 @@ bool findNode(const NodeListT &nodes, const QString &nodeId, NodeListT::const_it
 
 void setCheckOnError(int status, const QString &msg, CheckT &invalidCheck);
 
-StringPairT splitDataPointInfo(const QString &info); /* return <[sourcei:]hostaddr, checkid> */
+StringPairT splitDataPointInfo(const QString &info); /* return <[source:]hostaddr, checkid> */
 
 StringPairT splitSourceDataPointInfo(const QString &info); /* return <source, hostaddr> */
 
diff --git a/dbo/src/DbSession.cpp b/dbo/src/DbSession.cpp
index a3e8959b..255636d2 100644
--- a/dbo/src/DbSession.cpp
+++ b/dbo/src/DbSession.cpp
@@ -724,7 +724,7 @@ int DbSession::listStatusHistory(PlatformMappedStatusHistoryT& statusHistory, co
   return count;
 }
 
-int DbSession::getLastPlatformStatus(PlatformStatusT &platfotmStatus, const std::string &view)
+int DbSession::getLastPlatformStatus(PlatformStatusT &platformStatus, const std::string &view)
 {
   int count = -1;
   dbo::Transaction transaction(*this);
@@ -743,7 +743,7 @@ int DbSession::getLastPlatformStatus(PlatformStatusT &platfotmStatus, const std:
 
     if (queryResults.size() == 1) {
       count = 0;
-      platfotmStatus = queryResults.begin()->modify()->data();
+      platformStatus = queryResults.begin()->modify()->data();
     }
   }
   catch (const dbo::Exception &ex)
diff --git a/dbo/src/DbSession.hpp b/dbo/src/DbSession.hpp
index 69d1d323..4035f61c 100644
--- a/dbo/src/DbSession.hpp
+++ b/dbo/src/DbSession.hpp
@@ -72,7 +72,7 @@ class DbSession : public dbo::Session
   Wt::Auth::AuthService& auth() {
     return m_basicAuthService;
   }
-  Wt::Auth::PasswordService* passwordAuthentificator(void) {
+  Wt::Auth::PasswordService* passwordAuthenticator(void) {
     return m_passAuthService;
   }
   Wt::Auth::Login& wtAuthLogin(void) {
diff --git a/dbo/src/UserManagement.cpp b/dbo/src/UserManagement.cpp
index 7014a0dd..d3df96a3 100644
--- a/dbo/src/UserManagement.cpp
+++ b/dbo/src/UserManagement.cpp
@@ -63,7 +63,7 @@ UserFormModel::UserFormModel(const DboUserT* user, bool changePassword, bool use
   addField(UsernameField);
   addField(PasswordField);
   addField(CurrentPasswordField);
-  addField(PasswordConfimationField);
+  addField(PasswordConfirmationField);
   addField(FirstNameField);
   addField(LastNameField);
   addField(EmailField);
@@ -74,7 +74,7 @@ UserFormModel::UserFormModel(const DboUserT* user, bool changePassword, bool use
 
   setValidator(UsernameField, createNameValidator());;
   setValidator(PasswordField, createPasswordValidator());
-  setValidator(PasswordConfimationField, std::make_unique<ConfirmPasswordValidator>(this, PasswordField));
+  setValidator(PasswordConfirmationField, std::make_unique<ConfirmPasswordValidator>(this, PasswordField));
   setValidator(FirstNameField, createNameValidator());
   setValidator(FirstNameField, createNameValidator());
   setValidator(LastNameField, createNameValidator());
@@ -91,7 +91,7 @@ UserFormModel::UserFormModel(const DboUserT* user, bool changePassword, bool use
   if (changePassword) {
     setVisible(CurrentPasswordField, true);
     setVisible(PasswordField, true);
-    setVisible(PasswordConfimationField, true);
+    setVisible(PasswordConfirmationField, true);
     setVisible(UsernameField, false);
     setVisible(FirstNameField, false);
     setVisible(LastNameField, false);
@@ -105,7 +105,7 @@ UserFormModel::UserFormModel(const DboUserT* user, bool changePassword, bool use
     if (user) {
       setData(*user);
       setVisible(PasswordField, false);
-      setVisible(PasswordConfimationField, false);
+      setVisible(PasswordConfirmationField, false);
       setWritable(false);
     } else {
       setVisible(RegistrationDateField, false);
@@ -113,10 +113,10 @@ UserFormModel::UserFormModel(const DboUserT* user, bool changePassword, bool use
   }
 }
 
-void UserFormModel::setWritable(bool writtable)
+void UserFormModel::setWritable(bool writable)
 {
-  bool readonly = ! writtable;
-  setReadOnly(PasswordConfimationField, readonly);
+  bool readonly = ! writable;
+  setReadOnly(PasswordConfirmationField, readonly);
   setReadOnly(FirstNameField, readonly);
   setReadOnly(LastNameField, readonly);
   setReadOnly(EmailField, readonly);
@@ -182,9 +182,9 @@ UserFormView::UserFormView(const DboUserT* user, bool changePasswordTriggered, b
   setTemplateText(tr("userForm-template"));
   addFunction("id", &WTemplate::Functions::id);
   setFormWidget(UserFormModel::UsernameField, std::make_unique<Wt::WLineEdit>());
-  setFormWidget(UserFormModel::CurrentPasswordField, std::move(createPaswordField()));
-  setFormWidget(UserFormModel::PasswordField, std::move(createPaswordField()));
-  setFormWidget(UserFormModel::PasswordConfimationField, std::move(createPaswordField()));
+  setFormWidget(UserFormModel::CurrentPasswordField, std::move(createPasswordField()));
+  setFormWidget(UserFormModel::PasswordField, std::move(createPasswordField()));
+  setFormWidget(UserFormModel::PasswordConfirmationField, std::move(createPasswordField()));
   setFormWidget(UserFormModel::FirstNameField, std::make_unique<Wt::WLineEdit>());
 
   auto lastNameField = std::make_unique<Wt::WLineEdit>();
@@ -295,17 +295,17 @@ void UserFormView::reset(void)
   updateView(m_modelRef);
 }
 
-void UserFormView::setWritable(bool writtable)
+void UserFormView::setWritable(bool writable)
 {
-  m_modelRef->setWritable(writtable);
+  m_modelRef->setWritable(writable);
   updateView(m_modelRef);
 }
 
-void UserFormView::resetValidationState(bool writtable)
+void UserFormView::resetValidationState(bool writable)
 {
   m_modelRef->reset();
   m_modelRef->setData(m_user);
-  setWritable(writtable);
+  setWritable(writable);
 }
 
 void UserFormView::process(void)
@@ -383,7 +383,7 @@ std::unique_ptr<Wt::WComboBox> UserFormView::createUserRoleField(void)
 }
 
 
-std::unique_ptr<Wt::WLineEdit> UserFormView::createPaswordField(void)
+std::unique_ptr<Wt::WLineEdit> UserFormView::createPasswordField(void)
 {
   auto field = std::make_unique<Wt::WLineEdit>();
   field->setEchoMode(Wt::EchoMode::Password);
diff --git a/dbo/src/UserManagement.hpp b/dbo/src/UserManagement.hpp
index 3122efd7..3e257506 100644
--- a/dbo/src/UserManagement.hpp
+++ b/dbo/src/UserManagement.hpp
@@ -68,11 +68,11 @@ class ConfirmPasswordValidator : public Wt::WValidator
 class UserFormModel : public Wt::WFormModel
 {
 public:
-  static constexpr Wt::WFormModel::Field InfoBoxField = "infox-box";
+  static constexpr Wt::WFormModel::Field InfoBoxField = "info-box";
   static constexpr Wt::WFormModel::Field UsernameField = "user-name";
   static constexpr Wt::WFormModel::Field CurrentPasswordField = "current-password";
   static constexpr Wt::WFormModel::Field PasswordField = "password";
-  static constexpr Wt::WFormModel::Field PasswordConfimationField = "confirm-password";
+  static constexpr Wt::WFormModel::Field PasswordConfirmationField = "confirm-password";
   static constexpr Wt::WFormModel::Field FirstNameField = "first-name";
   static constexpr Wt::WFormModel::Field LastNameField = "last-name";
   static constexpr Wt::WFormModel::Field EmailField = "email";
@@ -82,7 +82,7 @@ class UserFormModel : public Wt::WFormModel
   static constexpr Wt::WFormModel::Field OperationsProfileTilesPerRow = "dashboard-tilesperrow";
 
   UserFormModel(const DboUserT* user, bool changePassword, bool userForm);
-  void setWritable(bool writtable);
+  void setWritable(bool writable);
   void setData(const DboUserT & user);
 
 private:
@@ -111,8 +111,8 @@ class UserFormView : public Wt::WTemplateFormView
   Wt::Signal<std::string, std::string, std::string>& changePasswordTriggered(void) {return m_changePasswordTriggered;}
   Wt::Signal<Wt::WMouseEvent>& closeTriggered(void) {return m_close;}
   void reset(void);
-  void setWritable(bool writtable);
-  void resetValidationState(bool writtable);
+  void setWritable(bool writable);
+  void resetValidationState(bool writable);
 
 private:
   DboUserT m_user;
@@ -136,7 +136,7 @@ class UserFormView : public Wt::WTemplateFormView
   void handleCancelClick(Wt::WMouseEvent ev);
   void handleChangePasswordClick(const std::string& login, const std::string& currentPass,const std::string& newPass);
   std::unique_ptr<Wt::WComboBox> createUserRoleField(void);
-  std::unique_ptr<Wt::WLineEdit> createPaswordField(void);
+  std::unique_ptr<Wt::WLineEdit> createPasswordField(void);
   void createChangePasswordDialog(void);
   std::unique_ptr<Wt::WComboBox> createDashboardDisplayModeField(void);
   std::unique_ptr<Wt::WSpinBox> createDashboardTilesPerRowField(void);
diff --git a/docs/deployement-on-kubernetes.md b/docs/deployment-on-kubernetes.md
similarity index 98%
rename from docs/deployement-on-kubernetes.md
rename to docs/deployment-on-kubernetes.md
index c1f25451..4ca04156 100644
--- a/docs/deployement-on-kubernetes.md
+++ b/docs/deployment-on-kubernetes.md
@@ -28,7 +28,7 @@ helm upgrade --namespace monitoring --install realopinsight manifests/helm/realo
 ```
 
 ## In-cluster access to service
-On success, the deployment does create a Kubernetes **ClusterIP** service named `realopinsiht`.
+On success, the deployment does create a Kubernetes **ClusterIP** service named `realopinsight`.
 
 This service exposes the RealOpInsight's web interface (port `80`) as well as its Prometheus exporter (port `4584`).
 
diff --git a/manifests/helm/realopinsight/values.yaml b/manifests/helm/realopinsight/values.yaml
index 3cb2d33d..e90fb65f 100644
--- a/manifests/helm/realopinsight/values.yaml
+++ b/manifests/helm/realopinsight/values.yaml
@@ -40,7 +40,7 @@ ingress:
   hosts:
     - host: realopinsight.local
       paths: []
-# uncomment the following lines and ajust the values to enable TLS
+# uncomment the following lines and adjust the values to enable TLS
   # tls:
   #  - secretName: realopinsight-tls
   #    hosts:
diff --git a/resources/css/realopinsight.css b/resources/css/realopinsight.css
index 5f1ee660..efc45b7c 100644
--- a/resources/css/realopinsight.css
+++ b/resources/css/realopinsight.css
@@ -97,7 +97,7 @@ ul {
 }
 
 
-/* these classes come from from bootstrap */
+/* these classes come from bootstrap */
 .navbar {
   margin: 0;
   padding: 0;
diff --git a/resources/i18n/messages.xml b/resources/i18n/messages.xml
index 2c9a0f33..a8dff1c9 100644
--- a/resources/i18n/messages.xml
+++ b/resources/i18n/messages.xml
@@ -41,7 +41,7 @@
             <div class="accordion-inner">
               <ul class="nav">
                 <li> ${menu-new-user}</li>
-                <li> ${menu-builin-users}</li>
+                <li> ${menu-builtin-users}</li>
                 <li> ${menu-ldap-users}</li>
               </ul>
             </div>
@@ -539,7 +539,7 @@
       <span id="auth-setting-save-button">${auth-settings-save-button}</span>
     </div>
 
-</div> <!-- class="form-hoizontal" -->
+</div> <!-- class="form-horizontal" -->
 </message>
 
 
@@ -597,7 +597,7 @@
       <span id="add-as-source-settings-button">${add-as-source-button}</span>
       <span id="delete-source-settings-button">${delete-button}</span>
     </div>
-</div> <!-- class="form-hoizontal" -->
+</div> <!-- class="form-horizontal" -->
 </message>
 
 
@@ -649,7 +649,7 @@
       <span id="open-service-view">${open-service-view}</span>
       <span id="import-native-config">${import-native-config}</span>
       <span id="import-zabbix-it-service">${import-zabbix-it-service}</span>
-      <span id="import-nabios-bpi">${import-nabios-bpi}</span>
+      <span id="import-nagios-bpi">${import-nagios-bpi}</span>
     </div>
   </fieldset>
 
@@ -725,7 +725,7 @@
     <div class="form-actions">
       <span id="notification-setting-save-button">${notification-settings-save-button}</span>
     </div>
-</div> <!-- class="form-hoizontal" -->
+</div> <!-- class="form-horizontal" -->
 </message>
 
 
diff --git a/resources/jPlayer/jquery.jplayer.js b/resources/jPlayer/jquery.jplayer.js
index 842f31b6..40825925 100644
--- a/resources/jPlayer/jquery.jplayer.js
+++ b/resources/jPlayer/jquery.jplayer.js
@@ -596,7 +596,7 @@
 			keyEnabled: false, // Enables keyboard controls.
 			audioFullScreen: false, // Enables keyboard controls to enter full screen with audio media.
 			keyBindings: { // The key control object, defining the key codes and the functions to execute.
-				// The parameter, f = $.jPlayer.focus, will be checked truethy before attempting to call any of these functions.
+				// The parameter, f = $.jPlayer.focus, will be checked truthy before attempting to call any of these functions.
 				// Properties may be added to this object, in key/fn pairs, to enable other key controls. EG, for the playlist add-on.
 				play: {
 					key: 80, // p
@@ -699,7 +699,7 @@
 			playbackRate: 1, // Warning - Now both an option and a status property
 			ended: 0
 
-/*		Persistant status properties created dynamically at _init():
+/*		Persistent status properties created dynamically at _init():
 			width
 			height
 			cssClass
@@ -865,7 +865,7 @@
 
 			this.options.volume = this._limitValue(this.options.volume, 0, 1); // Limit volume value's bounds.
 
-			// Create the formats array, with prority based on the order of the supplied formats string
+			// Create the formats array, with priority based on the order of the supplied formats string
 			$.each(this.options.supplied.toLowerCase().split(","), function(index1, value1) {
 				var format = value1.replace(/^\s+|\s+$/g, ""); //trim
 				if(self.format[format]) { // Check format is valid.
@@ -882,7 +882,7 @@
 				}
 			});
 
-			// Create the solutions array, with prority based on the order of the solution string
+			// Create the solutions array, with priority based on the order of the solution string
 			$.each(this.options.solution.toLowerCase().split(","), function(index1, value1) {
 				var solution = value1.replace(/^\s+|\s+$/g, ""); //trim
 				if(self.solution[solution]) { // Check solution is valid.
@@ -1212,7 +1212,7 @@
 			// MJP: The background change remains. Would need to store the original to restore it correctly.
 			// MJP: The jPlayer element's size change remains.
 
-			// Clear the media to reset the GUI and stop any downloads. Streams on some browsers had persited. (Chrome)
+			// Clear the media to reset the GUI and stop any downloads. Streams on some browsers had persisted. (Chrome)
 			this.clearMedia();
 			// Remove the size/sizeFull cssClass from the cssSelectorAncestor
 			this._removeUiClass();
@@ -1573,7 +1573,7 @@
 			var ct = 0, cpa = 0, sp = 0, cpr = 0;
 
 			// Fixes the duration bug in iOS, where the durationchange event occurs when media.duration is not always correct.
-			// Fixes the initial duration bug in BB OS7, where the media.duration is infinity and displays as NaN:NaN due to Date() using inifity.
+			// Fixes the initial duration bug in BB OS7, where the media.duration is infinity and displays as NaN:NaN due to Date() using infinity.
 			if(isFinite(media.duration)) {
 				this.status.duration = media.duration;
 			}
@@ -3162,7 +3162,7 @@
 		},
 		_aurora_playHead: function(percent) {
 			if(this.aurora.player.duration > 0) {
-				// The seek() sould be in milliseconds, but the only codec that works with seek (aac.js) uses seconds.
+				// The seek() should be in milliseconds, but the only codec that works with seek (aac.js) uses seconds.
 				this.aurora.player.seek(percent * this.aurora.player.duration / 100); // Using seconds
 			}
 				
diff --git a/resources/themes/bootstrap/2/wt.css b/resources/themes/bootstrap/2/wt.css
index 2b64caeb..196acddc 100644
--- a/resources/themes/bootstrap/2/wt.css
+++ b/resources/themes/bootstrap/2/wt.css
@@ -114,7 +114,7 @@
   box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
 }
 /*
- * Fix submens in popup menus in navbar
+ * Fix submenus in popup menus in navbar
  */
 .navbar .nav > li > .dropdown-menu.submenu:before {
   display: none;
diff --git a/resources/themes/bootstrap/2/wt.less b/resources/themes/bootstrap/2/wt.less
index 3bd6a0c6..69433733 100644
--- a/resources/themes/bootstrap/2/wt.less
+++ b/resources/themes/bootstrap/2/wt.less
@@ -105,7 +105,7 @@
 }
 
 /*
- * Fix submens in popup menus in navbar
+ * Fix submenus in popup menus in navbar
  */
 .navbar .nav > li > .dropdown-menu.submenu:before {
     display: none;
diff --git a/resources/themes/bootstrap/3/wt.css b/resources/themes/bootstrap/3/wt.css
index 6951517a..63769b85 100644
--- a/resources/themes/bootstrap/3/wt.css
+++ b/resources/themes/bootstrap/3/wt.css
@@ -104,7 +104,7 @@
 }
 
 /*
- * Fix submens in popup menus in navbar
+ * Fix submenus in popup menus in navbar
  */
 
 .navbar .nav > li > .dropdown-menu.submenu:before {
diff --git a/resources/themes/bootstrap/3/wt.less b/resources/themes/bootstrap/3/wt.less
index 0557951b..54bf7938 100644
--- a/resources/themes/bootstrap/3/wt.less
+++ b/resources/themes/bootstrap/3/wt.less
@@ -94,7 +94,7 @@
 }
 
 /*
- * Fix submens in popup menus in navbar
+ * Fix submenus in popup menus in navbar
  */
 .navbar .nav > li > .dropdown-menu.submenu:before {
     display: none;
diff --git a/resources/themes/bootstrap/wt.css b/resources/themes/bootstrap/wt.css
index 30b42329..f5dbc182 100644
--- a/resources/themes/bootstrap/wt.css
+++ b/resources/themes/bootstrap/wt.css
@@ -100,7 +100,7 @@
   box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
 }
 /*
- * Fix submens in popup menus in navbar
+ * Fix submenus in popup menus in navbar
  */
 .navbar .nav > li > .dropdown-menu.submenu:before {
   display: none;
diff --git a/resources/themes/bootstrap/wt.less b/resources/themes/bootstrap/wt.less
index 5e8b0959..dac6b78e 100644
--- a/resources/themes/bootstrap/wt.less
+++ b/resources/themes/bootstrap/wt.less
@@ -88,7 +88,7 @@
 }
 
 /*
- * Fix submens in popup menus in navbar
+ * Fix submenus in popup menus in navbar
  */
 .navbar .nav > li > .dropdown-menu.submenu:before {
   display: none;
diff --git a/unittests/tst_mklshelpertest.cpp b/unittests/tst_mklshelpertest.cpp
index 06744765..38e239ae 100644
--- a/unittests/tst_mklshelpertest.cpp
+++ b/unittests/tst_mklshelpertest.cpp
@@ -14,7 +14,7 @@ class LsHelperTest : public QObject
   
 private Q_SLOTS:
   void testCase1();
-  void testBadRecvingDataType();
+  void testBadReceivingDataType();
   void testCaseService();
   void testBadHostBadPort();
   void testLoadHostData();
@@ -40,7 +40,7 @@ void LsHelperTest::testCase1()
   mkhelper.disconnectFromService();
 }
 
-void LsHelperTest::testBadRecvingDataType()
+void LsHelperTest::testBadReceivingDataType()
 {
   QVERIFY(true == mkhelper.connectToService());
   mkhelper.clearData();
diff --git a/web/src/AuthManager.cpp b/web/src/AuthManager.cpp
index 8dda2efc..c32f175d 100644
--- a/web/src/AuthManager.cpp
+++ b/web/src/AuthManager.cpp
@@ -47,7 +47,7 @@ AuthManager::AuthManager(DbSession* dbSession)
   auto authProxyModel = std::make_unique<AuthModelProxy>(m_dbSession);
   authProxyModel->loginFailed().connect(this, &AuthManager::handleLoginFailed);
   authProxyModel->setVisible(Wt::Auth::AuthModel::RememberMeField, false);
-  authProxyModel->addPasswordAuth(m_dbSession->passwordAuthentificator());
+  authProxyModel->addPasswordAuth(m_dbSession->passwordAuthenticator());
   setModel(std::move(authProxyModel));
   setRegistrationEnabled(false);
   m_dbSession->wtAuthLogin().changed().connect(this, &AuthManager::handleAuthorization);
diff --git a/web/src/LdapHelper.cpp b/web/src/LdapHelper.cpp
index 82f6fa3e..9baa7ad7 100644
--- a/web/src/LdapHelper.cpp
+++ b/web/src/LdapHelper.cpp
@@ -90,14 +90,14 @@ void LdapHelper::setSslSettings(void)
 
 bool LdapHelper::loginWithDistinguishName(const std::string& dn, const std::string& password)
 {
-  // Intialize a connection handler
+  // Initialize a connection handler
   if (! ldap_is_ldap_url(m_serverUri.c_str()) ) {
     m_lastError = QObject::tr("Invalid LDAP URL: %1").arg(m_serverUri.c_str());
     return false;
   }
 
   if (! m_handler) {
-    m_lastError = QObject::tr("Unitialized handler");
+    m_lastError = QObject::tr("Uninitialized handler");
     return false;
   }
 
@@ -132,7 +132,7 @@ int LdapHelper::listUsers(const std::string& searchBase,
                           LdapUserMapT& userMap)
 {
   if (! m_handler) {
-    m_lastError = QObject::tr("LDAP: Unitialized handler");
+    m_lastError = QObject::tr("LDAP: Uninitialized handler");
     return -1;
   }
 
@@ -165,7 +165,7 @@ int LdapHelper::listUsers(const std::string& searchBase,
   for (LDAPMessage* currentEntry = ldap_first_entry(m_handler, searchResult);
        currentEntry != nullptr;
        currentEntry = ldap_next_entry(m_handler, currentEntry)) {
-    std::string dn = getObjectDistingisghName(currentEntry);
+    std::string dn = getObjectDistinguishName(currentEntry);
     userMap[dn].insert("dn", dn);
     parseObjectAttr(currentEntry, userMap[dn]);
   }
@@ -177,7 +177,7 @@ int LdapHelper::listUsers(const std::string& searchBase,
 }
 
 
-std::string LdapHelper::getObjectDistingisghName(LDAPMessage* objectData)
+std::string LdapHelper::getObjectDistinguishName(LDAPMessage* objectData)
 {
   char* buffer;
   std::string result = "";
diff --git a/web/src/LdapHelper.hpp b/web/src/LdapHelper.hpp
index 520698bf..dbae14b7 100644
--- a/web/src/LdapHelper.hpp
+++ b/web/src/LdapHelper.hpp
@@ -65,7 +65,7 @@ class LdapHelper
   int setupHandler(void);
   void cleanupHandler(void);
   void setSslSettings(void);
-  std::string getObjectDistingisghName(LDAPMessage* objectData);
+  std::string getObjectDistinguishName(LDAPMessage* objectData);
   void parseObjectAttr(LDAPMessage* objectData, LdapUserAttrsT& userInfo);
 };
 
diff --git a/web/src/Notificator.hpp b/web/src/Notificator.hpp
index 2bbdee6a..e40c6e13 100644
--- a/web/src/Notificator.hpp
+++ b/web/src/Notificator.hpp
@@ -44,6 +44,6 @@ class Notificator : public QObject
 private:
   std::unique_ptr<MailSender> m_mailSender;
   WebBaseSettings m_preferences;
-  QEventLoop m_eventSynchonizer;
+  QEventLoop m_eventSynchronizer;
 };
 #endif // NOTIFICATOR_H
diff --git a/web/src/WebDashboard.hpp b/web/src/WebDashboard.hpp
index ffed1da3..49e697a3 100644
--- a/web/src/WebDashboard.hpp
+++ b/web/src/WebDashboard.hpp
@@ -108,7 +108,7 @@ class WebDashboard : public DashboardBase, public Wt::WContainerWidget
   std::string m_eventContainerId;
 
   std::unique_ptr<Wt::WWidget> createEventFeedTpl(const NodeT& node);
-  void hanleRenderingAreaSizeChanged(double mapWidth, double mapHeight, double windowWidth, double windowHeight) {}
+  void handleRenderingAreaSizeChanged(double mapWidth, double mapHeight, double windowWidth, double windowHeight) {}
 };
 
 
diff --git a/web/src/WebDataSourceSettings.cpp b/web/src/WebDataSourceSettings.cpp
index 195e2dc5..5d9e32f0 100644
--- a/web/src/WebDataSourceSettings.cpp
+++ b/web/src/WebDataSourceSettings.cpp
@@ -62,7 +62,7 @@ WebDataSourceSettings::WebDataSourceSettings()
   m_monitorTypeFieldRef = bindNew<Wt::WComboBox>("monitor-type");
   m_monitorTypeFieldRef->addItem(Q_TR("-- Select a type --"));
   for (const auto& srcid: ngrt4n::MonitorSourceTypes) { m_monitorTypeFieldRef->addItem(srcid.toStdString()); }
-  m_monitorTypeFieldRef->activated().connect(this, &WebDataSourceSettings::updateComponentsVisibiliy);
+  m_monitorTypeFieldRef->activated().connect(this, &WebDataSourceSettings::updateComponentsVisibility);
 
   m_monitorUrlFieldRef = bindNew<Wt::WLineEdit>("monitor-url");
   m_monitorUrlFieldRef->setValidator(std::make_unique<UriValidator>("http", false, this));
@@ -218,7 +218,7 @@ void WebDataSourceSettings::applySourceChanges(int index)
 
   updateSourceDataModel(index);
   m_sourceSelectionFieldRef->setCurrentIndex(findFormSourceIndex(index));
-  m_operationCompleted.emit(ngrt4n::OperationSucceeded, Q_TR("settings udpated"));
+  m_operationCompleted.emit(ngrt4n::OperationSucceeded, Q_TR("settings updated"));
 }
 
 
@@ -333,7 +333,7 @@ void WebDataSourceSettings::fillInFormGivenSourceId(int sid)
   m_dontVerifyCertificateFieldRef->setCheckState(sourceLoaded.second.verify_ssl_peer? Wt::CheckState::Unchecked : Wt::CheckState::Checked);
   m_updateIntervalFieldRef->setValue(updateInterval());
 
-  updateComponentsVisibiliy(m_monitorTypeFieldRef->currentIndex());
+  updateComponentsVisibility(m_monitorTypeFieldRef->currentIndex());
 
   m_sourceSelectionFieldRef->setCurrentIndex(sid);
 }
@@ -398,7 +398,7 @@ void WebDataSourceSettings::handleSourceBoxChanged(void)
 }
 
 
-void WebDataSourceSettings::updateComponentsVisibiliy(int monitorTypeCurrentIndex)
+void WebDataSourceSettings::updateComponentsVisibility(int monitorTypeCurrentIndex)
 {
   const auto monitorType = QString::fromStdString(m_monitorTypeFieldRef->itemText(monitorTypeCurrentIndex).toUTF8());
 
diff --git a/web/src/WebDataSourceSettings.hpp b/web/src/WebDataSourceSettings.hpp
index 5dbb5901..776dc091 100644
--- a/web/src/WebDataSourceSettings.hpp
+++ b/web/src/WebDataSourceSettings.hpp
@@ -84,7 +84,7 @@ class WebDataSourceSettings : public WebBaseSettings, public Wt::WTemplate
   int findFormSourceIndex(int sid);
   void updateSourceDataModel(int sid);
   void handleSourceBoxChanged(void);
-  void updateComponentsVisibiliy(int monitorTypeCurrentIndex);
+  void updateComponentsVisibility(int monitorTypeCurrentIndex);
   void handleShowAuthStringChanged(void);
   void saveSourceInDatabase(const SourceT& sinfo);
   SourceT getSourceInfoByIndex(int sourceIndex);
diff --git a/web/src/WebEditor.cpp b/web/src/WebEditor.cpp
index ea021a0e..c58d4a07 100644
--- a/web/src/WebEditor.cpp
+++ b/web/src/WebEditor.cpp
@@ -103,7 +103,7 @@ WebEditor::WebEditor(void)
   auto importNagiosBpiBtn = std::make_unique<Wt::WImage>(Wt::WLink("images/built-in/import-nagios_32x32.png"));
   importNagiosBpiBtn->setToolTip(Q_TR("Import Nagios BPI"));
   importNagiosBpiBtn->clicked().connect(this, &WebEditor::handleImportNagiosBpiButton);
-  m_editionPaneRef->bindWidget("import-nabios-bpi", std::move(importNagiosBpiBtn));
+  m_editionPaneRef->bindWidget("import-nagios-bpi", std::move(importNagiosBpiBtn));
 
   // name field
   m_nameFieldRef = m_editionPaneRef->bindNew<Wt::WLineEdit>("name-field");
@@ -873,20 +873,20 @@ void WebEditor::importNagiosBpi(const std::string& srcId, const std::string& bpi
       break;
     }
 
-    QString groudId = fields[1];
+    QString groupId = fields[1];
 
-    NodeListT::Iterator currentGroupSrv = cdata.bpnodes.find(groudId);
+    NodeListT::Iterator currentGroupSrv = cdata.bpnodes.find(groupId);
     if (currentGroupSrv == cdata.bpnodes.end()) {
       NodeT groupSrv;
-      groupSrv.id = groudId;
-      groupSrv.name = groudId;
+      groupSrv.id = groupId;
+      groupSrv.name = groupId;
       groupSrv.type = NodeType::BusinessService;
       groupSrv.parents.clear();
       groupSrv.sev_prule = PropRules::Unchanged;
       groupSrv.sev_crule = CalcRules::Worst;
       groupSrv.weight = ngrt4n::WEIGHT_UNIT;
       groupSrv.icon = ngrt4n::DEFAULT_ICON;
-      currentGroupSrv = cdata.bpnodes.insert(groudId, groupSrv);
+      currentGroupSrv = cdata.bpnodes.insert(groupId, groupSrv);
     }
 
     currentGroupSrv->sev_crule = CalcRules::Worst;
diff --git a/web/src/WebMainUI.cpp b/web/src/WebMainUI.cpp
index 07bb67cf..ca3ba707 100644
--- a/web/src/WebMainUI.cpp
+++ b/web/src/WebMainUI.cpp
@@ -106,17 +106,17 @@ WebMainUI::WebMainUI(AuthManager* authManager)
   loggedUserMenu->addItem(std::move(loggedUserMenuItem));
   m_navbarRef->addMenu(std::move(loggedUserMenu), Wt::AlignmentFlag::Right);
 
-  auto toobarActionIcon = ngrt4n::createFontAwesomeTextButton("fa fa-refresh", "Refresh the console map");
-  toobarActionIcon->clicked().connect(this, &WebMainUI::handleRefresh);
-  m_navbarRef->addWidget(std::move(toobarActionIcon));
+  auto toolbarActionIcon = ngrt4n::createFontAwesomeTextButton("fa fa-refresh", "Refresh the console map");
+  toolbarActionIcon->clicked().connect(this, &WebMainUI::handleRefresh);
+  m_navbarRef->addWidget(std::move(toolbarActionIcon));
 
-  toobarActionIcon = ngrt4n::createFontAwesomeTextButton("fa fa-search-plus", "Zoom the console map in");
-  toobarActionIcon->clicked().connect(std::bind(&WebMainUI::scaleMap, this, ngrt4n::SCALIN_FACTOR));
-  m_navbarRef->addWidget(std::move(toobarActionIcon));
+  toolbarActionIcon = ngrt4n::createFontAwesomeTextButton("fa fa-search-plus", "Zoom the console map in");
+  toolbarActionIcon->clicked().connect(std::bind(&WebMainUI::scaleMap, this, ngrt4n::SCALIN_FACTOR));
+  m_navbarRef->addWidget(std::move(toolbarActionIcon));
 
-  toobarActionIcon = ngrt4n::createFontAwesomeTextButton("fa fa-search-minus","Zoom the console map out");
-  toobarActionIcon->clicked().connect(std::bind(&WebMainUI::scaleMap, this, ngrt4n::SCALOUT_FACTOR));
-  m_navbarRef->addWidget(std::move(toobarActionIcon));
+  toolbarActionIcon = ngrt4n::createFontAwesomeTextButton("fa fa-search-minus","Zoom the console map out");
+  toolbarActionIcon->clicked().connect(std::bind(&WebMainUI::scaleMap, this, ngrt4n::SCALOUT_FACTOR));
+  m_navbarRef->addWidget(std::move(toolbarActionIcon));
 
   // problems icons
   if (! m_dbSession->isLoggedAdmin()) {
@@ -208,7 +208,7 @@ WebMainUI::WebMainUI(AuthManager* authManager)
     linkPtr = std::make_unique<Wt::WAnchor>("#", Q_TR("All Users"));
     linkPtr->clicked().connect(this, &WebMainUI::handleManageBuiltinUsers);
     m_menuLinks.insert(MenuBuiltInUsers, linkPtr.get());
-    m_settingsPageRef->bindWidget("menu-builin-users", std::move(linkPtr));
+    m_settingsPageRef->bindWidget("menu-builtin-users", std::move(linkPtr));
 
     // ldap user menu
     auto ldapUserManager = std::make_unique<LdapUserManager>(m_dbSession);
@@ -313,7 +313,7 @@ Wt::WTemplate* WebMainUI::buildExecutiveViewPage(void)
   }
 
   // Generate view cards
-  int currentThumbailIndex = 0;
+  int currentThumbnailIndex = 0;
   int cardPerRow = m_dbSession->boardCardsPerRow();
   std::string failuresCount = "";
   for (const auto& sv : listOfUserViews) {
@@ -336,8 +336,8 @@ Wt::WTemplate* WebMainUI::buildExecutiveViewPage(void)
     thumbnail->clicked().connect(std::bind(&WebMainUI::handleDashboardSelected, this, thumbnailTitle));
     m_thumbnailComments[thumbnailTitle] = thumbnail->bindNew<Wt::WLabel>("thumb-problem-details", "");
     m_thumbnails.insert(thumbnailTitle, thumbnail.get());
-    thumbnailsLayout->addWidget(std::move(thumbnail), currentThumbailIndex / cardPerRow, currentThumbailIndex % cardPerRow);
-    ++currentThumbailIndex;
+    thumbnailsLayout->addWidget(std::move(thumbnail), currentThumbnailIndex / cardPerRow, currentThumbnailIndex % cardPerRow);
+    ++currentThumbnailIndex;
   }
 
   if (m_dbSession->displayOnlyTiles()) {
@@ -349,11 +349,11 @@ Wt::WTemplate* WebMainUI::buildExecutiveViewPage(void)
     doJavaScript("$('#ngrt4n-side-pane').removeClass().addClass('col-sm-4');");
   }
 
-  if (currentThumbailIndex > 0) {
-    startDashbaordUpdate();
+  if (currentThumbnailIndex > 0) {
+    startDashboardUpdate();
   }
 
-  if (currentThumbailIndex != static_cast<int>(listOfUserViews.size())) {
+  if (currentThumbnailIndex != static_cast<int>(listOfUserViews.size())) {
     showMessage(ngrt4n::OperationFailed, QObject::tr("Failed to load views => %1. Check details in logs").arg(failuresCount.c_str()).toStdString());
   }
   auto thumbnails = std::make_unique<Wt::WContainerWidget>();
@@ -466,7 +466,7 @@ void WebMainUI::disableAdminFeatures(void)
 {
   wApp->doJavaScript("$('#userMenuSection').hide();"
                      "$('#viewMenuBlock').hide();"
-                     "$('#menu-database-settingss').hide();"
+                     "$('#menu-database-settings').hide();"
                      "$('#menu-auth-settings').hide();"
                      "$('#menu-notification-settings').hide();"
                      "$('#menu-license-activation').hide();");
@@ -506,9 +506,9 @@ void WebMainUI::handleRefresh(void)
     currentBoard->updateAllNodesStatus();
     currentBoard->updateMap();
     NodeT currentRootNode = currentBoard->rootNode();
-    int overvallSeverity = qMin(currentRootNode.sev, static_cast<int>(ngrt4n::Unknown));
-    if (overvallSeverity != ngrt4n::Normal) {
-      ++appStates[overvallSeverity];
+    int overallSeverity = qMin(currentRootNode.sev, static_cast<int>(ngrt4n::Unknown));
+    if (overallSeverity != ngrt4n::Normal) {
+      ++appStates[overallSeverity];
       if (m_notificationManager) {
         m_notificationManager->updateServiceData(currentRootNode);
       }
@@ -877,7 +877,7 @@ bool WebMainUI::createDirectory(const std::string& path, bool cleanContent)
 }
 
 
-void WebMainUI::startDashbaordUpdate(void)
+void WebMainUI::startDashboardUpdate(void)
 {
   auto newTimer(new Wt::WTimer());
   newTimer->setInterval(std::chrono::milliseconds(2000));
diff --git a/web/src/WebMainUI.hpp b/web/src/WebMainUI.hpp
index bfb6fd48..fb8112d4 100644
--- a/web/src/WebMainUI.hpp
+++ b/web/src/WebMainUI.hpp
@@ -87,7 +87,7 @@ class WebMainUI : public QObject, public Wt::WContainerWidget
   void enable(void) {
     m_mainWidgetRef->enable();
   }
-  void disbale(void) {
+  void disable(void) {
     m_mainWidgetRef->disable();
   }
   void handleRefresh(void);
@@ -195,7 +195,7 @@ public Q_SLOTS:
   void scaleMap(double factor);
   void selectItem4Preview(void);
   void setInternalPath(const std::string& path);
-  void startDashbaordUpdate(void);
+  void startDashboardUpdate(void);
   void disableAdminFeatures(void);
   void setupMenus(void);
   void saveViewInfoIntoDatabase(const CoreDataT& cdata, const QString& path);
diff --git a/web/src/WebMap.cpp b/web/src/WebMap.cpp
index 2b0b426e..28ba4bd9 100644
--- a/web/src/WebMap.cpp
+++ b/web/src/WebMap.cpp
@@ -69,7 +69,7 @@ WebMap::WebMap(CoreDataT* cdata)
 
 WebMap::~WebMap()
 {
-  removeThumdImage();
+  removeThumbImage();
 }
 
 void WebMap::setPreferredMethod(void)
@@ -285,7 +285,7 @@ void WebMap::applyVisibilityToChild(const NodeT& node, qint8 mask)
 }
 
 
-void WebMap::removeThumdImage(void)
+void WebMap::removeThumbImage(void)
 {
   QFile file(m_thumbURL.c_str());
   file.remove();
diff --git a/web/src/WebMap.hpp b/web/src/WebMap.hpp
index 1d36bd7a..d43fa51d 100644
--- a/web/src/WebMap.hpp
+++ b/web/src/WebMap.hpp
@@ -78,7 +78,7 @@ class WebMap : public Wt::WPaintedWidget
   void handleContainedSizeChanged(double mapW, double mapH, double winW, double winH);
   void expandCollapse(const QString& nodeId);
   void applyVisibilityToChild(const NodeT& node, qint8 mask);
-  void removeThumdImage(void);
+  void removeThumbImage(void);
   QString toBase64RootNodeName(void);
 };
 
diff --git a/web/src/WebNotificationSettings.cpp b/web/src/WebNotificationSettings.cpp
index def98cf6..f9754713 100644
--- a/web/src/WebNotificationSettings.cpp
+++ b/web/src/WebNotificationSettings.cpp
@@ -98,7 +98,7 @@ void WebNotificationSettings::saveChanges(void)
     settings.setKeyValue(SettingFactory::NOTIF_MAIL_SMTP_SERVER_PORT, m_smtpPortFieldRef->text().toUTF8().c_str());
     settings.setKeyValue(SettingFactory::NOTIF_MAIL_SMTP_USE_SSL, QString::number(int(m_smtpUseSslFieldRef->checkState())));
   }
-  m_operationCompleted.emit(ngrt4n::OperationSucceeded, Q_TR("settings udpated"));
+  m_operationCompleted.emit(ngrt4n::OperationSucceeded, Q_TR("settings updated"));
 }
 
 
diff --git a/web/src/WebPlatformStatusRaw.cpp b/web/src/WebPlatformStatusRaw.cpp
index db47342c..6d92074a 100644
--- a/web/src/WebPlatformStatusRaw.cpp
+++ b/web/src/WebPlatformStatusRaw.cpp
@@ -90,7 +90,7 @@ void WebPlatformStatusRaw::updateData(const ListofPlatformStatusT& data)
 
   setXSeriesColumn(0);
 
-  const QMap<int, int> SerieSeverities = {
+  const QMap<int, int> SeriesSeverities = {
     {0, ngrt4n::Unset},
     {1, ngrt4n::Unset},
     {2, ngrt4n::Normal},
@@ -103,13 +103,13 @@ void WebPlatformStatusRaw::updateData(const ListofPlatformStatusT& data)
   };
 
   for (int i = 8; i >= 2; --i) {
-    auto serie = std::make_unique<Wt::Chart::WDataSeries>(i, Wt::Chart::SeriesType::Line);
-    Wt::WColor color = ngrt4n::severityWColor(SerieSeverities[i]);
-    serie->setPen(color);
-    serie->setBrush(color);
-    serie->setStacked(true);
-    serie->setFillRange(Wt::Chart::FillRangeType::MinimumValue);
-    addSeries(std::move(serie));
+    auto series = std::make_unique<Wt::Chart::WDataSeries>(i, Wt::Chart::SeriesType::Line);
+    Wt::WColor color = ngrt4n::severityWColor(SeriesSeverities[i]);
+    series->setPen(color);
+    series->setBrush(color);
+    series->setStacked(true);
+    series->setFillRange(Wt::Chart::FillRangeType::MinimumValue);
+    addSeries(std::move(series));
   }
   resize(900, 300);
   setPanEnabled(true);
diff --git a/web/src/realopinsight-reportd.cpp b/web/src/realopinsight-reportd.cpp
index 9ba0fbc3..c0f9b6fc 100644
--- a/web/src/realopinsight-reportd.cpp
+++ b/web/src/realopinsight-reportd.cpp
@@ -87,9 +87,9 @@ void runCollector(int period)
       auto& promStatusMinor = promMetrics.Add({{"scope", view.name}, {"status", "minor"}});
       auto& promStatusNormal = promMetrics.Add({{"scope", view.name}, {"status", "normal"}});
 
-      auto initilizeOut = collector.initialize(view.path.c_str());
-      if (initilizeOut.first != ngrt4n::RcSuccess) {
-        REPORTD_LOG("error", QObject::tr("%1: %2").arg(view.name.c_str(), initilizeOut.second).toStdString());
+      auto initializeOut = collector.initialize(view.path.c_str());
+      if (initializeOut.first != ngrt4n::RcSuccess) {
+        REPORTD_LOG("error", QObject::tr("%1: %2").arg(view.name.c_str(), initializeOut.second).toStdString());
         promStatusOverall.Set(ngrt4n::Unknown);
         promStatusCritical.Set(-1);
         promStatusUnknown.Set(-1);
diff --git a/web/src/utils/smtpclient/MailSender.cpp b/web/src/utils/smtpclient/MailSender.cpp
index 9868f396..1c54ceb8 100644
--- a/web/src/utils/smtpclient/MailSender.cpp
+++ b/web/src/utils/smtpclient/MailSender.cpp
@@ -24,7 +24,7 @@ int MailSender::send(const QString& sender,
 {
   if (! m_connected) {
     connectToHost(m_host, m_port);
-    if (m_eventSynchonizer.exec() != 0)
+    if (m_eventSynchronizer.exec() != 0)
       return -1;
   }
 
@@ -44,7 +44,7 @@ int MailSender::send(const QString& sender,
 
   int messageId = QxtSmtp::send(message);
   m_spool.insert(messageId, message);
-  int exitCode = m_eventSynchonizer.exec();
+  int exitCode = m_eventSynchronizer.exec();
 
   return exitCode;
 }
@@ -53,14 +53,14 @@ int MailSender::send(const QString& sender,
 void MailSender::handleConnected(void)
 {
   m_connected = true;
-  m_eventSynchonizer.exit(0);
+  m_eventSynchronizer.exit(0);
 }
 
 void MailSender::handleConnectionFailed(const QByteArray& msg)
 {
   m_connected = false;
   m_lastError = tr("SMTP connection failed: %1").arg(QString(msg));
-  m_eventSynchonizer.exit(-1);
+  m_eventSynchronizer.exit(-1);
 }
 
 void MailSender::handleMailFailed(int mailID, int errorCode, const QByteArray& msg)
@@ -70,7 +70,7 @@ void MailSender::handleMailFailed(int mailID, int errorCode, const QByteArray& m
                    ).arg(QString::number(errorCode),
                          msg,
                          QString::number(mailID));
-  m_eventSynchonizer.exit(-1);
+  m_eventSynchronizer.exit(-1);
 }
 
 void MailSender::handleSenderRejected(int mailID, const QString& address, const QByteArray & msg)
@@ -79,16 +79,16 @@ void MailSender::handleSenderRejected(int mailID, const QString& address, const
   m_lastError = tr("SMTP rejected mail sender."
                    " Message: %1. Address: %2."
                    ).arg(QString(msg), address);
-  m_eventSynchonizer.exit(-1);
+  m_eventSynchronizer.exit(-1);
 }
 
 void MailSender::handleMailSent(int mailID)
 {
-  m_lastError = tr("Email successfuly sent to %1"
+  m_lastError = tr("Email successfully sent to %1"
                    ).arg(m_spool[mailID].recipients().join(","));
 
   m_spool.remove(mailID);
-  m_eventSynchonizer.exit(0);
+  m_eventSynchronizer.exit(0);
 }
 
 
diff --git a/web/src/utils/smtpclient/MailSender.hpp b/web/src/utils/smtpclient/MailSender.hpp
index 9fff4ba5..689742f8 100644
--- a/web/src/utils/smtpclient/MailSender.hpp
+++ b/web/src/utils/smtpclient/MailSender.hpp
@@ -31,7 +31,7 @@ protected Q_SLOTS:
   int m_port;
   bool m_connected;
   QString m_lastError;
-  QEventLoop m_eventSynchonizer;
+  QEventLoop m_eventSynchronizer;
   QMap<int, QxtMailMessage> m_spool;
 
   void addEvents(void);
diff --git a/web/src/utils/smtpclient/qxtmailattachment.cpp b/web/src/utils/smtpclient/qxtmailattachment.cpp
index a770af85..c9f6f4c3 100644
--- a/web/src/utils/smtpclient/qxtmailattachment.cpp
+++ b/web/src/utils/smtpclient/qxtmailattachment.cpp
@@ -32,7 +32,7 @@
 /*!
  * \class QxtMailAttachment
  * \inmodule QxtNetwork
- * \brief The QxtMailAttachment class represents an attachement to a QxtMailMessage
+ * \brief The QxtMailAttachment class represents an attachment to a QxtMailMessage
  */
 
 
diff --git a/web/src/utils/wtwithqt/WQApplication.h b/web/src/utils/wtwithqt/WQApplication.h
index 821ec82b..fd276dfe 100644
--- a/web/src/utils/wtwithqt/WQApplication.h
+++ b/web/src/utils/wtwithqt/WQApplication.h
@@ -38,10 +38,10 @@ namespace Wt {
 class DispatchThread;
 
 /*! \class WQApplication WQApplication WQApplication
- *  \brief An application class that provides interopability between
+ *  \brief An application class that provides interoperability between
  *         Wt and Qt.
  *
- * This class provides interopability between the Wt's multi threading
+ * This class provides interoperability between the Wt's multi threading
  * model and Qt's threading requirements for QObject. This is needed
  * because Qt's object model, which defines a hierarchy of QObjects,
  * requires that every QObject in the hierarchy is created from within
@@ -103,7 +103,7 @@ class WQApplication : public WApplication
    *         QThread context.
    *
    * Reimplement this method to construct your Wt widget and Qt object
-   * hierarchy within the context of the dedicatd QThread.
+   * hierarchy within the context of the dedicated QThread.
    *
    * This method is called from within the library after your
    * application is created.