diff --git a/World-properties.md b/World-properties.md
index 4358a26..b33519a 100644
--- a/World-properties.md
+++ b/World-properties.md
@@ -23,9 +23,13 @@ Here are the various properties of worlds that can be set in `worlds.yml`. __Nor
1. [Auto-Heal](#wiki-autoheal)
1. [Adjust Spawn](#wiki-adjustspawn)
+---
+
## •World Permissions
You can easily control who can enter various worlds in Multiverse 2. To allow people access to a world, simply grant them access to `multiverse.access.WORLDNAME` where WORLDNAME is the name of the world. By default (with PermissionsBukkit) people _can_ enter newly created worlds. You can give users `multiverse.access.*` to let them access all worlds, or set the same to false to deny access to all worlds.
+---
+
## •Default Spawn World
Multiverse 2.2+ allows you to set what world users will spawn in. This does _not_ have to be the world that is in `server.properties`. To do this, make sure you have the following 2 values set in your `[[config.yml]]`. You can set this value ingame by using `/mv conf firstspawnoverride true` and `/mv conf firstspawnworld myworld`. We advise against editing the file, but here is the clip:
@@ -42,6 +46,8 @@ firstspawnworld: world
...
```
+---
+
## •Animals
### Spawning
The overall control of the spawning of animals on a world. If true, animals (pigs, chickens, cows and squids) will spawn in this world.
@@ -82,6 +88,8 @@ You should read this as "Animals __can__ spawn __except__ for pigs."
[Back to Top](#wiki-top)
+---
+
## •Monsters
### Spawning
The overall control of the spawning of monsters on a world. If true, monsters (anything not in the animals list above) will spawn in this world. Monsters _will not_ spawn in a world where the [difficulty](#wiki-difficulty) is set to `peaceful`, even if this variable is set to true.
@@ -122,6 +130,8 @@ You should read this as "Monsters __can__ spawn __except__ for creepers."
[Back to Top](#wiki-top)
+---
+
## •Environment
The type of environment this world is under. Can currently be `SKYLANDS`, `NETHER`, and `NORMAL`. You __should not__ change this value in the config.
@@ -137,6 +147,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Generators
Multiverse 2 allows you to use custom world generators via a [[Custom Generator Plugin|Custom-Generator-Plugins]]. This line contains the information multiverse needs to load your worlds properly. You __should not__ touch this value unless you know what you're doing.
@@ -153,6 +165,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •World Fees
You can charge users to enter various worlds. The coolest part is you don't have to use an econ plugin! You can simply use minecraft items!
@@ -180,6 +194,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •PVP
Whether or not players may harm each other in this world. If set to true, they may.
@@ -194,6 +210,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Alias
World aliases allow you to name a world differently than what the folder name is. This lets you choose fancy names for your worlds while keeping the folders nice and neat.
@@ -216,6 +234,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •World Blacklist
The world blacklist allows you to specify worlds that people __cannot go__ to from the specified world. For example, if you add `world_gold` to `world`'s `worldblacklist`, then players could teleport TO `world_gold` from `world` but not back.
@@ -230,6 +250,8 @@ The world blacklist allows you to specify worlds that people __cannot go__ to fr
[Back to Top](#wiki-top)
+---
+
## •Seed
The seed for this world. Do not change unless you are aware of the consequences of doing so (**WILL** cause chunk errors!).
@@ -244,6 +266,8 @@ __This command can not be used in-game. You cannot change the seed of a generate
[Back to Top](#wiki-top)
+---
+
## •Scale
Scaling of worlds when using Multiverse-NetherPortals. Setting this value will have no effect on anything but Multiverse-NetherPortals. See [the Multiverse-Netherportals documentation](https://github.com/Multiverse/Multiverse-NetherPortals/wiki/Simple-tutorial) for how this works.
@@ -254,8 +278,11 @@ __NOTE:__ If you see a `scaling` value, you can delete it. It got carried over i
__In Game Usage:__
`mvm set scale 1.2`
+
[Back to Top](#wiki-top)
+---
+
## •Respawn World
The world you will respawn to if you die in this world. This value can be the same as this world.
@@ -269,8 +296,11 @@ __NOTE:__ If you see a `temprespawn` value, you can delete it. It got carried ov
__In Game Usage:__
`mvm set respawn MyWorld`
+
[Back to Top](#wiki-top)
+---
+
## •Keep Spawn in Memory
If you disable this, bukkit will not keep this world's spawn chunks in memory, resulting in less memory used by your server when people are not logged in.
@@ -285,6 +315,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Weather
If this value is true, a world will have weather events, if false, it will not. If you want to turn off the current storm, just type `/mvm set weather false`, wait for the weather to subside, and then `/mvm set weather true`.
@@ -299,6 +331,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Game Mode
Allows you to set the type of mode a specific world is set to. Creative mode gives players unlimited resources while Survival makes boys become men. For more information about inventories on servers that use this feature, see our [[FAQ on Inventories|FAQ#wiki-inv]]
@@ -320,6 +354,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Difficulty
Allows you to set the difficulty of a given world. All possible values are: `0, 1, 2, 3, peaceful, easy, normal, hard`. Remember that there are only 4 difficulties, we just let you set it with either the int or the string. They are always stored as ints in the config.
@@ -337,6 +373,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Hunger
Allows you to enable or disable hunger depletion in each world.
@@ -352,6 +390,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •World Visibility
This property allows you to have a world that exists, but does not show up in lists. When users chat from this world, if `worldnameprefix` is set to `true` and it is hidden, their chat will appear with no world prefix.
@@ -366,6 +406,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Auto-Heal
If your [difficulty](#wiki-difficulty) is set to `peaceful`, by default, players will regain health. If you do not want them to, simply set this variable to false. This setting has no effect on worlds with a [difficulty](#wiki-difficulty) greater than `peaceful` or `0`.
@@ -381,6 +423,8 @@ __In Game Usage:__
[Back to Top](#wiki-top)
+---
+
## •Adjust Spawn
By default, Multiverse will fix spawns that are recorded in poor locations. By default the Minecraft server uses something like a `getTopBlock()` method and sets the spawn's `Y` coordinate somewhere in the middle of the earth. This is usually not safe to teleport a player directly too, so Multiverse will search for the nearest safe location.
@@ -402,4 +446,21 @@ __In Game Usage:__
`mvm set adjustspawn true`
`mvm set adjustspawn false`
+[Back to Top](#wiki-top)
+
+---
+
+## •Time
+Multiverse inclues _very basic_ support for setting world times. It does not scale time, or lock it or rewind it. It is provided mainly as an api for higher level things like server managers to set the time to something.
+
+__Type__:
+`String`
+
+__Example:__
+**This value is not present in the `config.yml`**
+
+__In Game Usage:__
+`mvm set autoheal true`
+`mvm set autoheal false`
+
[Back to Top](#wiki-top)
\ No newline at end of file
diff --git a/tutorial/Basic-multiverse-tutorial.md b/tutorial/basics.md
similarity index 100%
rename from tutorial/Basic-multiverse-tutorial.md
rename to tutorial/basics.md
diff --git a/Install-Multiverse-Core.md b/tutorial/install.md
similarity index 100%
rename from Install-Multiverse-Core.md
rename to tutorial/install.md
diff --git a/Permissions.md b/tutorial/permissions.md
similarity index 100%
rename from Permissions.md
rename to tutorial/permissions.md