diff --git a/source/development/api/be/OPNBEcore.rst b/source/development/api/be/OPNBEcore.rst
index 3626a41a..66ffa9c3 100644
--- a/source/development/api/be/OPNBEcore.rst
+++ b/source/development/api/be/OPNBEcore.rst
@@ -42,7 +42,6 @@ and how these are tied into services. It's also a key component in comparing con
           "md5": "942d6358fb4f17abed7cf4f5de6c5b24",
           "id": "aliases"
         },
-        ....
       "runtime": 0.07380509376525879
     }
 
diff --git a/source/manual/git-backup.rst b/source/manual/git-backup.rst
index 631ecd3b..62760b0a 100644
--- a/source/manual/git-backup.rst
+++ b/source/manual/git-backup.rst
@@ -55,7 +55,7 @@ we choose this loosely coupled method. Events which are yet unprocessed are bein
     remains active.
 
 Git backup will push collected commits to the upstream repository nightly.
-To shorten this default interval, a custom cronjob (see :doc:`Settings </manual/settingsmenu#cron>`) can be
+To shorten this default interval, a custom cronjob (see :doc:`Settings </manual/settingsmenu>`) can be
 set up, selecting `Remote Backup` as the Command. The regular backup procedure (which is also being triggered using the test
 button in the user interface) is responsible for initialising the empty local repository and configuring the upstream target.
 
diff --git a/source/manual/how-tos/cachingproxy.rst b/source/manual/how-tos/cachingproxy.rst
index c4443909..93d7dbab 100644
--- a/source/manual/how-tos/cachingproxy.rst
+++ b/source/manual/how-tos/cachingproxy.rst
@@ -19,7 +19,7 @@ Change Proxy Interfaces
 -----------------------
 If you want to change the interfaces (subnets) the proxy will bind to then click
 on the tab **Forward Proxy**. Now add/remove the interfaces in the **Proxy interfaces**
-field. 
+field.
 
 ---------------------------
 Change Proxy Listening Port
@@ -106,7 +106,7 @@ http://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml
 
 This list is a simple flat list that looks like this:
 
-.. code-block:: guess
+.. code-block:: 
 
     101com.com
     101order.com
diff --git a/source/manual/how-tos/guestnet.rst b/source/manual/how-tos/guestnet.rst
index 665f7e67..56a02564 100644
--- a/source/manual/how-tos/guestnet.rst
+++ b/source/manual/how-tos/guestnet.rst
@@ -265,7 +265,7 @@ Let's make the following changes to the template:
 
 Find the following part:
 
-.. code-block:: guess
+.. code-block:: html
 
   <header class="page-head">
   <nav class="navbar navbar-default" >
@@ -281,7 +281,7 @@ Find the following part:
 
 And change to:
 
-.. code-block:: guess
+.. code-block:: html
 
     <header class="page-head">
         <div align="center">
@@ -304,7 +304,7 @@ Enter a **Template Name**, for this example we use **Company**.
 Hit Upload ( |upload| )
 
 .. |download| image:: images/btn_download.png
-      :width: 100%
+    :width: 30px
 
 .. |upload| image:: images/btn_upload.png
 
@@ -438,7 +438,7 @@ For the example we create 10 vouchers. Click on **Generate**.
 A file will be generated called **Wi-Fi day pass.csv**.
 The content of this file looks like this:
 
-.. code-block:: guess
+.. code-block::
 
     username,password,vouchergroup,validity
     "IgJw@Pqf","MLi+Sb7Ak#","Wi-Fi day pass","86400"
@@ -540,7 +540,7 @@ Logout. For this feature we will use OPNsense's built-in API calls.
 
 In particular we will use the following API call (for zone id 0):
 
-.. code-block:: guess
+.. code-block::
 
   /api/captiveportal/access/status/0/
 
@@ -590,7 +590,7 @@ For this example we will use the cli to list the status off all active sessions.
 
 Type the following on the cli prompt to do so (for zone id 0):
 
-.. code-block:: guess
+.. code-block::
 
   configctl captiveportal list_clients 0
 
diff --git a/source/manual/how-tos/proxyicapantivirus.rst b/source/manual/how-tos/proxyicapantivirus.rst
index 116e2119..c6fed899 100644
--- a/source/manual/how-tos/proxyicapantivirus.rst
+++ b/source/manual/how-tos/proxyicapantivirus.rst
@@ -80,7 +80,7 @@ have also configured the transparent SSL proxy mode.
 
 If everything went well you should see something similar to this in you browser:
 
-.. code-block:: guess
+.. code-block::
 
   The content you just requested contains EICAR Test String and was blocked by the
   Symantec Protection Engine based on local administrator settings. Contact your
diff --git a/source/manual/how-tos/sslvpn_s2s.rst b/source/manual/how-tos/sslvpn_s2s.rst
index f00a0fcb..0730e86e 100644
--- a/source/manual/how-tos/sslvpn_s2s.rst
+++ b/source/manual/how-tos/sslvpn_s2s.rst
@@ -221,7 +221,7 @@ You will see the shared key, copy this and keep it safe!
 
 Sample key:
 
-.. code-block:: guess
+.. code-block:: 
 
   #
   # 2048 bit OpenVPN static key
diff --git a/source/manual/settingsmenu.rst b/source/manual/settingsmenu.rst
index cdf4b2e0..90a2dec8 100644
--- a/source/manual/settingsmenu.rst
+++ b/source/manual/settingsmenu.rst
@@ -10,7 +10,7 @@ Administration
 --------------
 
 The settings on this page concerns logging into OPNsense. The “Secure Shell” settings are described under
-:ref:`Creating Users & Groups<SSH and console login>`.
+:doc:`Creating Users & Groups</manual/how-tos/user-local>`.
 
 +----------------------------------------------+-----------------------------------------------------------------------+
 | Setting                                      | Explanation                                                           |