diff --git a/README.md b/README.md
index 35e5bef..b9baf05 100755
--- a/README.md
+++ b/README.md
@@ -2,4 +2,8 @@
  
 ### A very dynamic dashboard, with many features
 
-Check back later for the docs, but for now you can look at the pre-existing modules as examples.
+Modulator is basically just a fancy dashboard template, but with a very extensible module system, and security features!
+
+[Read the wiki!](https://github.com/Astatin3/Modulator/wiki)
+
+![alt text](https://raw.githubusercontent.com/Astatin3/images/main/Modulator-1.png)
\ No newline at end of file
diff --git a/modules/main/Dashboard.html b/modules/main/Dashboard.html
index eb13ad6..f1ba348 100755
--- a/modules/main/Dashboard.html
+++ b/modules/main/Dashboard.html
@@ -1,5 +1,18 @@
+<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+
 <main class="container">
-  <h1><!--Place title here!!!--></h1>
-  <h5>A very dynamic dashboard, with many features</h5>
-  <p>Check back later for the docs, but for now you can look at the pre-existing modules as examples.</p>
-</main>
\ No newline at end of file
+  <div id="content"></div>
+</main>
+
+<script>
+
+var req = new XMLHttpRequest();
+
+req.open('GET', 'https://raw.githubusercontent.com/Astatin3/Modulator/main/README.md', false);
+req.send(null);
+
+if(req.status == 200) {
+  document.getElementById('content').innerHTML = marked.parse(req.responseText)
+}
+
+</script>
\ No newline at end of file
diff --git a/modules/main/docs-home.html b/modules/main/docs-home.html
new file mode 100644
index 0000000..91e40c8
--- /dev/null
+++ b/modules/main/docs-home.html
@@ -0,0 +1,18 @@
+<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+
+<main class="container">
+  <div id="content"></div>
+</main>
+
+<script>
+
+var req = new XMLHttpRequest();
+
+req.open('GET', 'https://raw.githubusercontent.com/wiki/Astatin3/Modulator/Home.md', false);
+req.send(null);
+
+if(req.status == 200) {
+  document.getElementById('content').innerHTML = marked.parse(req.responseText)
+}
+
+</script>
\ No newline at end of file
diff --git a/modules/main/docs-writing-modules.html b/modules/main/docs-writing-modules.html
new file mode 100644
index 0000000..c2b0bd4
--- /dev/null
+++ b/modules/main/docs-writing-modules.html
@@ -0,0 +1,18 @@
+<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+
+<main class="container">
+  <div id="content"></div>
+</main>
+
+<script>
+
+var req = new XMLHttpRequest();
+
+req.open('GET', 'https://raw.githubusercontent.com/wiki/Astatin3/Modulator/Writing-a-module.md', false);
+req.send(null);
+
+if(req.status == 200) {
+  document.getElementById('content').innerHTML = marked.parse(req.responseText)
+}
+
+</script>
\ No newline at end of file
diff --git a/modules/main/main.py b/modules/main/main.py
index f3ea7b3..1574978 100755
--- a/modules/main/main.py
+++ b/modules/main/main.py
@@ -79,7 +79,7 @@ def changePassword(ac, data):
   correctName = ac.user.id == data['data']['id']
   
   
-  if isAdmin and not 'old' in data['data']:
+  if isAdmin and correctName and not 'old' in data['data']:
     mm.sendPopupError(ac.rawClient, "Error", "You are not authorised")
     return
   
diff --git a/modules/main/module.json b/modules/main/module.json
index d828bfa..581de3c 100755
--- a/modules/main/module.json
+++ b/modules/main/module.json
@@ -14,6 +14,24 @@
                     "requiredPermGroup": "",
                     "location": "modules/main/Dashboard.html"
                 },
+                {
+                    "type": "folder",
+                    "name": "Docs",
+                    "pages": [
+                        {
+                            "type": "page",
+                            "name": "Home",
+                            "requiredPermGroup": "",
+                            "location": "modules/main/docs-home.html"
+                        },
+                        {
+                            "type": "page",
+                            "name": "Modules",
+                            "requiredPermGroup": "Admins",
+                            "location": "modules/main/docs-writing-modules.html"
+                        }
+                    ]
+                },
                 {
                     "type": "folder",
                     "name": "Settings",