diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index 45e9b646..a0e99404 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -17,6 +17,7 @@ menuitem "Vote to force a team change" 		[ showmenu "force team" ]
 menuitem "Vote to kick a player"		[showmenu "kick player"]
 menuitem "Vote to ban a player" 		[showmenu "ban player"]
 menuitem "Vote to remove bans"			"removebans"
+menuitem "Vote for autoteam"			[ showmenu "Auto Adjust Teams" ]
 
 newmenu Gamemode
 
@@ -36,6 +37,11 @@ newmenu Mastermode
 menuitem "Unlock the server (open)"		"mastermode 0"
 menuitem "Lock the server (private)"		"mastermode 1"
 
+newmenu "Auto Adjust Teams"
+
+menuitem "Turn auto-team on"	"autoteam 1"
+menuitem "Turn auto-team off"	"autoteam 0"
+
 
 newmenu voicecom 1 1
 
diff --git a/docs/basics.xml b/docs/basics.xml
index 71d415f0..c6f28b28 100644
--- a/docs/basics.xml
+++ b/docs/basics.xml
@@ -203,7 +203,7 @@
       Choosing a weapon
     </h2>
     <p>
-      <img style="float:right;margin-left:10px;" src="pics/weaponselect.jpg" />
+      <img style="float:right;margin-left:10px;margin-bottom:5px;" src="pics/weaponselect.jpg" />
       To select a primary weapon, press B to show the weapon menu (you can also find this menu inside of the 
       settings menu).<br />
       This menu will give you the option to pick any of the four primary weapons (Assault rifle, Sniper
@@ -236,6 +236,12 @@
       To learn more about the mini-map, see <a href="interface.xml#minimap">here</a>.
     </p>
     <h2 style="margin-top:25px;">
+      Scoreboard
+    </h2>
+    <p>
+      You can see the scoreboard by pressing <b>TAB</b>. More information about the scoreboard can be found <a href="interface.xml#scoreboard">here</a>.
+    </p>
+    <h2>
       Talking/Chatting
     </h2>
     <p>
@@ -247,7 +253,9 @@
       This will bring up the console with a <i>%</i> sign in-front of it. The <i>%</i> sign is what is needed infront of <i>ANYTHING</i>
       you say to make it be seen <i>ONLY</i> by your team.
     </p>
-    <h2 >Gibs</h2>
+    <h2>
+      Gibs
+    </h2>
     <p>
       <i>Gibs</i> are a great way of defeating another player. If you want to gain a lot of points fast, this is the way to do it, because
       gibs count for <b>2</b> points!
@@ -255,35 +263,92 @@
     <p>
       Gibs are created by: Headshots from sniper rifles, deaths from knifing &amp; deaths from grenade blasts.
     </p>
-    <h2>TO BE CONTINUED...</h2>
-    
-    <!-- TO DO!
-    resetbinds, resetcfg
-    <h2>
-      Console
-    </h2>
     <h2>
       Voting
     </h2>
-    <p>Include choosing a map, etc</p>
-    <h2>
-      Screenshots &amp; demos
-    </h2>
+    <p>
+      Voting can be used to do many various things in Multiplayer. Such as changing mode/map, forcing a team change, changing mastermode, 
+      kick or ban a player, setting autoteam and removing bans.
+    </p>
+    <p>
+      You can make these votes through the menus in:  Multiplayer &rArr; Server voting
+      <br /> ...or by simply typing the command, i.e. <i>/ctf ac_mines</i> would start a vote for ac_mines in CTF mode.<br />
+      <b>Note</b>: You can only start a vote every now and then.
+    </p>
+    <p>
+      Use <b>F1</b> to vote for votes that appear at the bottom left of your screen and use <b>F2</b> to vote against them.
+    </p>
     <h2>
       Voice-com
     </h2>
+    <p>
+      To use the voice-coms during a multiplayer game, press <b>V</b>.<br /> Then using numbers, select the voice-com you would like to say. <br />
+      Alternatively, you can go through: Multiplayer &rArr; VoiceCom.
+    </p>
     <h2>
-      Crouching &amp; jumping
+      Screenshots
     </h2>
+    <p>
+      You can create a screenshot, at anytime during the game by pressing <b>F12</b>, or by typing <b>/screenshot</b>. Most players use
+      screenshots as a way of keeping a record of their scores.
+    </p>
     <h2>
-      Scoreboard
+      Demos
     </h2>
+    <p>
+      Demos are a little bit like video recordings of the game. Because of how they work, they're small files, so don't worry about file-sizes.
+      To start a demo in-game, use the menu and navigate to: <i>Demos &rArr; record demo</i>. A vote will be made to record a demo for the next match.
+    </p>
+    <p>
+      The next match, a recording will be made and you can vote to stop recording the demo at any time through: <i>Demos &rArr; Stop recording/playback</i>.
+      When the demo stops being recorded you will be prompted to download it by pressing <b>F10</b> and if pressed your demo will be downloaded.
+    </p>
+    <p>
+      If you would like to download a previous demo that's still located on the server, you can use: <i>Demos &rArr; List demos</i> in the menus. 
+      Then, type <i>/getdemo X</i> but replace <b>X</b> for the number for the demo that you want to download from the server. If you use getdemo 
+      from the menus, it will only download the last created demo on the server.
+    </p>
+    <h2>
+      Reset binds
+    </h2>
+    <p>
+      If you would like to reset all your controls back to the defaults, you can type the <b>/resetbinds</b> command.
+      You can find this inside <b>settings &rArr; Keyboard/mouse controls</b> by choosing <b>[ Reset binds to defaults ]</b>.
+    </p>
+    <h2>
+      Reset configs
+    </h2>
+    <p>
+      If you would like to be able to reset all settings <u>AND</u> controls to default values, you can do this easily by typing <b>/resetcfg</b>.
+      You can find this inside the <b>settings</b> menu by selecting <b>Reset all settings</b>.
+    </p>
+    <p>
+      This command will delete the saved.cfg and the init.cfg file which contains all the settings for AssaultCube.
+    </p>    
+    <h2>
+      Console
+    </h2>
+    <p>
+      The console shows you messages from the game at the top-left corner of your screen. It also displays chat from other players.
+      If you find that the console is moving too fast for you and you missed an important message that you would like to read, you can 
+      extend the console by pressing <b>F11</b>. You can also scroll up through the message by pressing the minus <b>-</b> key on your keypad.
+    </p>
+    <p>
+      More information about the console can be found <a href="interface.xml#console">here</a>.
+    </p>
     <h2>
       In-game reference
     </h2>
-    <p>f1=disable doc reference; F2=more; F3=Less</p>
-    <p>Add link for special manuevers</p> -->
-   
-    
+    <p>
+      If you would like to see a reference of commands during the game, you can access these 
+      through the menu by going through: Help &rArr; AssaultCube reference.
+    </p>
+    <p>
+      If you know the command you would like to use, but just want some information about it, you can type the command into AssaultCube 
+      and information about this command will be displayed. You can disable this documentation reference if you want by pressing F1 when it is shown.
+    </p>
+    <h3 style="text-align:center">
+      Done here? How about checking out the <a href="maneuvers.xml">special maneuvers</a>!
+    </h3> 
   </body>
 </html>
\ No newline at end of file
diff --git a/docs/interface.xml b/docs/interface.xml
index 176a9bf0..82fcbf38 100644
--- a/docs/interface.xml
+++ b/docs/interface.xml
@@ -9,7 +9,7 @@
   <body>
     <h1>The interface</h1>
     
-    <h2>The console</h2>
+    <h2 id="console">The console</h2>
     <p>
       Many actions in AssaultCube can be done in a console. Although not entirely neccesary to use it (the menu can
       be used to do most important commands) it can be very useful and often easier/faster to use it.