diff --git a/build.gradle b/build.gradle
index 73ab0f9c..ed8936ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
 //Project details
 description "All you need to set up a server and more!"
 group "bammerbom"
-version "3.0.4-SNAPSHOT"
+version "3.0.4"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
diff --git a/docs/commands.md b/docs/commands.md
index fd06bb3b..5b84e0fe 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -2,84 +2,86 @@ Commands
 ====
 
 [/adventure \[Player\] - Change someone's gamemode to adventure.](commands/adventure.md)<br>
-[/afk \[Player\] \[Message\] - Toggle whether a player is marked as away-from-keyboard.](commands/afk.md)<br>
+[/afk \[Player\] \[Message…\] - Toggle whether a player is marked as away-from-keyboard.](commands/afk.md)<br>
 [/back - Teleport back to the location you were before you teleported.](commands/back.md)<br>
+[/broadcast \<Message…\> - Send a message to everyone on the server.](commands/broadcast.md)<br>
 [/burn \<Player\> \[Time\] - Set people on fire.](commands/burn.md)<br>
+[/clearinventory \[Player\] - Remove all items from someone's inventory.](commands/clearinventory.md)<br>
 [/commandspy \[Player\] - Toggle a player's or your own commandspy status.](commands/commandspy.md)<br>
 [/country \<Player\> - View the country where a player is from.](commands/country.md)<br>
-[/createkit \<Name\> \[Time\] \[Description\] - Create a kit with the contents of your inventory.](commands/createkit.md)<br>
+[/createkit \<Name\> \[Cooldown\] \[Description…\] - Create a kit with the contents of your inventory.](commands/createkit.md)<br>
 [/creative \[Player\] - Change someone's gamemode to creative.](commands/creative.md)<br>
 [/day - Set the time in a certain world to day.](commands/day.md)<br>
-[/deaf \<Player\> \[Time\] \[Reason\] - Make a player deaf, for a certain time and reason.](commands/deaf.md)<br>
-[/deaf \<Player\> \[Time\] \[Reason\] - Make a player deaf, for a certain time and reason.](commands/deaf.md)<br>
+[/deaf \<Player\> \[Time\] \[Reason…\] - Make a player deaf, for a certain time and reason.](commands/deaf.md)<br>
 [/delfirstspawn - Delete the new player spawn.](commands/delfirstspawn.md)<br>
 [/delglobalspawn - Delete the global spawn.](commands/delglobalspawn.md)<br>
 [/delgroupspawn \<Group\> - Delete a group spawn.](commands/delgroupspawn.md)<br>
-[/delhome \<Name\> - Remove a home.](commands/delhome.md)<br>
+[/delhome \<Home\> - Remove a home.](commands/delhome.md)<br>
 [/deljail \<Jail\> - Remove the jail with the provided name.](commands/deljail.md)<br>
 [/delwarp \<Warp\> - Remove the specified warp.](commands/delwarp.md)<br>
 [/firstspawn \[Player\] - Teleport someone to the new player spawn.](commands/firstspawn.md)<br>
 [/fly \[Player\] - Toggle someone's fly status.](commands/fly.md)<br>
 [/food \[Player\] - Fill a player's food bar.](commands/food.md)<br>
-[/gamemode \<Survival/Creative/Adventure/Spectator\> \[Player\] - Change a player's gamemode.](commands/gamemode.md)<br>
+[/gamemode \<Gamemode\> \[Player\] - Change a player's gamemode.](commands/gamemode.md)<br>
 [/globalspawn \[Player\] - Teleport someone to the global spawn.](commands/globalspawn.md)<br>
 [/god \[Player\] - Toggle your or someone else's god mode.](commands/god.md)<br>
 [/groupspawn \[Player\] \[Group\] - Teleport someone to a group spawn.](commands/groupspawn.md)<br>
 [/heal \[Player\] - Heal a player.](commands/heal.md)<br>
-[/home \<Name\> - Teleport to your home.](commands/home.md)<br>
+[/home \[Home\] - Teleport to your home.](commands/home.md)<br>
 [/homelist - View a list of your homes.](commands/homelist.md)<br>
-[/itemcanbreak \<Block\> \[Block\] \[Block\]... - Change the blocks this item can break.](commands/itemcanbreak.md)<br>
-[/itemcanplaceon \<Block\> \[Block\] \[Block\]... - Change the blocks this item can be placed on.](commands/itemcanplaceon.md)<br>
+[/itemcanbreak \<Blocktypes…\> - Change the blocks this item can break.](commands/itemcanbreak.md)<br>
+[/itemcanplaceon \<Blocktypes…\> - Change the blocks this item can be placed on.](commands/itemcanplaceon.md)<br>
 [/itemdurability \<Durability\> - Change the durability of the item in your hand.](commands/itemdurability.md)<br>
 [/itemenchant \<Enchantment\> \[Level\] - Add an enchantment to the item in your hand.](commands/itemenchant.md)<br>
-[/itemhidetags attributes/candestroy/canplace/enchantments/miscellaneous/unbreakable false/true - Change whether a certain tag is hidden.](commands/itemhidetags.md)<br>
-[/itemlore \<Lore\>\[|LORE\]\[|LORE\] - Change the lore of the item in your hand. Use | for multiple lines.](commands/itemlore.md)<br>
-[/itemname \<Name\> - Change the name of the item in your hand.](commands/itemname.md)<br>
+[/itemhidetags attributes/candestroy/canplaceon/enchantments/miscellaneous/unbreakable Enable/Disable - Change whether a certain tag is hidden.](commands/itemhidetags.md)<br>
+[/itemlore \<Lore…\> - Change the lore of the item in your hand. Use | for multiple lines.](commands/itemlore.md)<br>
+[/itemname \<Name…\> - Change the name of the item in your hand.](commands/itemname.md)<br>
 [/itemquantity \<Quantity\> - Change the quantity of the item in your hand.](commands/itemquantity.md)<br>
-[/itemunbreakable true/false - Change whether the item in your hand is unbreakable.](commands/itemunbreakable.md)<br>
-[/jail \<Player\> \[Jail\] \[Time\] \[Reason\] - Jail a player in a certain jail, for a certain time and with a certain reason.](commands/jail.md)<br>
+[/itemunbreakable \<Enabled/disabled\> - Change whether the item in your hand is unbreakable.](commands/itemunbreakable.md)<br>
+[/jail \<Player\> \[Jail\] \[Time\] \[Reason…\] - Jail a player in a certain jail, for a certain time and with a certain reason.](commands/jail.md)<br>
 [/jaillist - View a list of all jails.](commands/jaillist.md)<br>
 [/jailtp \<Jail\> - Teleport to a jail without jailing yourself.](commands/jailtp.md)<br>
-[/kick \<Player\> \[Reason\] - Kick a player from the server.](commands/kick.md)<br>
-[/kickall \[Reason\] - Kick all players from the server.](commands/kickall.md)<br>
-[/kit \<Kit\> - Use a certain kit.](commands/kit.md)<br>
+[/kick \<Player\> \[Reason…\] - Kick a player from the server.](commands/kick.md)<br>
+[/kickall \[Reason…\] - Kick all players from the server.](commands/kickall.md)<br>
+[/kit \[Kit\] - Use a certain kit.](commands/kit.md)<br>
 [/kitlist - Get a paginated list of all kits.](commands/kitlist.md)<br>
-[/commandspy \[Player\] - Toggle a player's or your own commandspy status.](commands/messagespy.md)<br>
+[/messagespy \[Player\] - Toggle a player's or your own commandspy status.](commands/messagespy.md)<br>
 [/more - Set the quantity of the item in your hand to the maximum.](commands/more.md)<br>
-[/mute \<Player\> \[Time\] \[Reason\] - Mute a player, for a certain time and reason.](commands/mute.md)<br>
-[/mute \<Player\> \[Time\] \[Reason\] - Mute a player, for a certain time and reason.](commands/mute.md)<br>
+[/mute \<Player\> \[Time\] \[Reason…\] - Mute a player, for a certain time and reason.](commands/mute.md)<br>
 [/night - Set the time in a certain world to night.](commands/night.md)<br>
-[/personalmessage \<Player\> \<Message\> - Send a private message to an other player.](commands/personalmessage.md)<br>
+[/personalmessage \<Player\> \<Message…\> - Send a private message to an other player.](commands/personalmessage.md)<br>
 [/rain \[World\] - Change the weather to rain.](commands/rain.md)<br>
-[/random \[Min\] \<Max\> - Generate a random number between two values.](commands/random.md)<br>
+[/random \<Min\> \[Second\] - Generate a random number between two values.](commands/random.md)<br>
 [/removekit \<Kit\> - Permanently delete a kit.](commands/removekit.md)<br>
-[/repair \[All/Hand\] - Repair the item in your hand, or all items in your inventory.](commands/repair.md)<br>
-[/reply \<Message\> - Send a private message to the person who last private messaged you.](commands/reply.md)<br>
+[/repair \[All\] - Repair the item in your hand, or all items in your inventory.](commands/repair.md)<br>
+[/reply \<Message…\> - Send a private message to the person who last private messaged you.](commands/reply.md)<br>
 [/setfirstspawn - Set the new player spawn.](commands/setfirstspawn.md)<br>
 [/setglobalspawn - Set the global spawn.](commands/setglobalspawn.md)<br>
 [/setgroupspawn \<Group\> - Set a group spawn.](commands/setgroupspawn.md)<br>
-[/sethealth \<Amount\> \[Player\] - Set the health of a player.](commands/sethealth.md)<br>
-[/sethome \<Name\> - Set a new home or move the location of a home.](commands/sethome.md)<br>
-[/setjail \<Jail\> \[Description\] - Create a new jail with your current location.](commands/setjail.md)<br>
-[/setmaxhealth \<Amount\> \[Player\] - Set the max health of a player.](commands/setmaxhealth.md)<br>
-[/setwarp \<Name\> \[Description\] - Create a new warp with the specified name and description.](commands/setwarp.md)<br>
+[/sethealth \<Health\> \[Player\] - Set the health of a player.](commands/sethealth.md)<br>
+[/sethome \<Home\> - Set a new home or move the location of a home.](commands/sethome.md)<br>
+[/setjail \<Jail\> \[Description…\] - Create a new jail with your current location.](commands/setjail.md)<br>
+[/setmaxhealth \<Health\> \[Player\] - Set the max health of a player.](commands/setmaxhealth.md)<br>
+[/setwarp \<Name\> \[Description…\] - Create a new warp with the specified name and description.](commands/setwarp.md)<br>
 [/spawn \[Player\] - Teleport someone to the spawn.](commands/spawn.md)<br>
 [/spectator \[Player\] - Change someone's gamemode to spectator.](commands/spectator.md)<br>
-[/sudo \<Player\> \[/\]\<Command/Message\> - Force a player to chat or to use a command.
+[/sudo \<Player\> \<Command…\> - Force a player to chat or to use a command.
 /sudo <Player> /command
 /sudo <Player> message](commands/sudo.md)<br>
 [/sun \[World\] - Change the weather to sun.](commands/sun.md)<br>
 [/survival \[Player\] - Change someone's gamemode to survival.](commands/survival.md)<br>
 [/teleport \[Player\] \<Player\> OR /teleport \[Player\] \<X\> \[Y\] \<Z\> \[\<Yaw\> \<Pitch\>\] - Teleport a player or yourself to another player or certain coordinates.](commands/teleport.md)<br>
-[/tpaccept \[TPID/Player\] - Accept the specified request, or the most recent one.](commands/teleportaccept.md)<br>
+[/teleportaccept \[Tpid\] - Accept the specified request, or the most recent one.](commands/teleportaccept.md)<br>
 [/teleportask \<Player\> - Ask to teleport to a player.](commands/teleportask.md)<br>
 [/teleportaskhere \<Player\> - Ask to teleport a player to you.](commands/teleportaskhere.md)<br>
-[/tpdeny \[TPID/Player\] - Deny the specified request, or the most recent one.](commands/teleportdeny.md)<br>
+[/teleportdeny \[Tpid\] - Deny the specified request, or the most recent one.](commands/teleportdeny.md)<br>
 [/thunder \[World\] - Change the weather to thunder.](commands/thunder.md)<br>
 [/time (set/add) day/night/\<ticks\>/enable/disable/query - Time-related actions.](commands/time.md)<br>
-[/ultimatecore modules/resetuser/clearcache/gendocs/reload - The UltimateCore base command.](commands/ultimatecore.md)<br>
+[/ultimatecore gendocs|reload|clearcache|resetuser|error|modules - The UltimateCore base command.](commands/ultimatecore.md)<br>
+[/undeaf \<Player\> - Make a player no longer deaf.](commands/undeaf.md)<br>
 [/unjail \<Player\> - Unjail a player.](commands/unjail.md)<br>
+[/unmute \<Player\> - Unmute a player.](commands/unmute.md)<br>
 [/vanish \[Player\] - Toggle whether a player is vanished.](commands/vanish.md)<br>
-[/warp \<Warp\> - Teleport yourself to the specified warp.](commands/warp.md)<br>
+[/warp \[Warp\] - Teleport yourself to the specified warp.](commands/warp.md)<br>
 [/warplist - Get a paginated list of all warps.](commands/warplist.md)<br>
-[/weather \<Sun/Rain/Thunder\> \[World\] - Change the weather to sun, rain or thunder.](commands/weather.md)<br>
+[/weather sun/rain/thunder \[World\] - Change the weather to sun, rain or thunder.](commands/weather.md)<br>
diff --git a/docs/commands/afk.md b/docs/commands/afk.md
index 113aa5a4..ad27d970 100644
--- a/docs/commands/afk.md
+++ b/docs/commands/afk.md
@@ -2,7 +2,7 @@ Afk
 ====
 Toggle whether a player is marked as away-from-keyboard.
 
-Usage: /afk \[Player\] \[Message\]<br>
+Usage: /afk \[Player\] \[Message…\]<br>
 Aliases: afk, idle, away<br>
 Module: [afk](../modules/afk.md)<br>
 
@@ -11,6 +11,6 @@ Basic role: everyone<br>
 
 Permissions: <br>
 * **uc.afk.afk.base** - Recommended role: everyone<br>Allows you to toggle your own afk status.
-* **uc.afk.afk.base.message** - Recommended role: everyone<br>Allows you to provide a reason for being afk.
-* **uc.afk.afk.others** - Recommended role: mod<br>Allows you to toggle another player's afk status.
+* **uc.afk.afk.message** - Recommended role: everyone<br>Allows you to provide a reason for being afk.
+* **uc.afk.afk.others.base** - Recommended role: mod<br>Allows you to toggle another player's afk status.
 * **uc.afk.afk.others.message** - Recommended role: mod<br>Allows you to provide an message while toggling another player's afk status.
diff --git a/docs/commands/broadcast.md b/docs/commands/broadcast.md
new file mode 100644
index 00000000..5763f026
--- /dev/null
+++ b/docs/commands/broadcast.md
@@ -0,0 +1,13 @@
+Broadcast
+====
+Send a message to everyone on the server.
+
+Usage: /broadcast \<Message…\><br>
+Aliases: broadcast<br>
+Module: [broadcast](../modules/broadcast.md)<br>
+
+Basic permission: uc.broadcast.broadcast.base<br>
+Basic role: admin<br>
+
+Permissions: <br>
+* **uc.broadcast.broadcast.base** - Recommended role: admin<br>Allows you to use the /broadcast command.
diff --git a/docs/commands/clearinventory.md b/docs/commands/clearinventory.md
new file mode 100644
index 00000000..d6421dc5
--- /dev/null
+++ b/docs/commands/clearinventory.md
@@ -0,0 +1,14 @@
+Clearinventory
+====
+Remove all items from someone's inventory.
+
+Usage: /clearinventory \[Player\]<br>
+Aliases: clearinventory, clear, ci<br>
+Module: [inventory](../modules/inventory.md)<br>
+
+Basic permission: uc.inventory.clearinventory.base<br>
+Basic role: admin<br>
+
+Permissions: <br>
+* **uc.inventory.clearinventory.base** - Recommended role: admin<br>Allows you to use the /clearinventory command.
+* **others** - Recommended role: admin<br>Allows you to use the /clearinventory command on other players
diff --git a/docs/commands/createkit.md b/docs/commands/createkit.md
index b252333f..a3e68293 100644
--- a/docs/commands/createkit.md
+++ b/docs/commands/createkit.md
@@ -2,7 +2,7 @@ Createkit
 ====
 Create a kit with the contents of your inventory.
 
-Usage: /createkit \<Name\> \[Time\] \[Description\]<br>
+Usage: /createkit \<Name\> \[Cooldown\] \[Description…\]<br>
 Aliases: createkit, kitcreate, addkit, kitadd<br>
 Module: [kit](../modules/kit.md)<br>
 
diff --git a/docs/commands/deaf.md b/docs/commands/deaf.md
index 66aa994f..5ed1a2d8 100644
--- a/docs/commands/deaf.md
+++ b/docs/commands/deaf.md
@@ -2,15 +2,15 @@ Deaf
 ====
 Make a player deaf, for a certain time and reason.
 
-Usage: /deaf \<Player\> \[Time\] \[Reason\]<br>
-Aliases: undeaf<br>
+Usage: /deaf \<Player\> \[Time\] \[Reason…\]<br>
+Aliases: deaf<br>
 Module: [deaf](../modules/deaf.md)<br>
 
-Basic permission: uc.deaf.undeaf.base<br>
+Basic permission: uc.deaf.deaf.base<br>
 Basic role: mod<br>
 
 Permissions: <br>
-* **uc.deaf.undeaf.base** - Recommended role: mod<br>Allows you to undeaf someone.
+* **uc.deaf.deaf.base** - Recommended role: mod<br>Allows you to deaf someone.
 
 Permission options: <br>
 * **uc.deaf.exemptpower**<br>The amount of exemptpower the player has. If a player's deafpower is higher than or equal to the targets exemptpower he can deaf the target.
diff --git a/docs/commands/delfirstspawn.md b/docs/commands/delfirstspawn.md
index f1034929..db930f67 100644
--- a/docs/commands/delfirstspawn.md
+++ b/docs/commands/delfirstspawn.md
@@ -3,7 +3,7 @@ Delfirstspawn
 Delete the new player spawn.
 
 Usage: /delfirstspawn<br>
-Aliases: delfirstspawn<br>
+Aliases: delfirstspawn, removefirstspawn<br>
 Module: [spawn](../modules/spawn.md)<br>
 
 Basic permission: uc.spawn.delfirstspawn.base<br>
diff --git a/docs/commands/delglobalspawn.md b/docs/commands/delglobalspawn.md
index df043ef8..2098333a 100644
--- a/docs/commands/delglobalspawn.md
+++ b/docs/commands/delglobalspawn.md
@@ -3,7 +3,7 @@ Delglobalspawn
 Delete the global spawn.
 
 Usage: /delglobalspawn<br>
-Aliases: delglobalspawn, delspawn<br>
+Aliases: delglobalspawn, delspawn, removeglobalspawn, removespawn<br>
 Module: [spawn](../modules/spawn.md)<br>
 
 Basic permission: uc.spawn.delglobalspawn.base<br>
diff --git a/docs/commands/delgroupspawn.md b/docs/commands/delgroupspawn.md
index 3adf89f2..3d42d735 100644
--- a/docs/commands/delgroupspawn.md
+++ b/docs/commands/delgroupspawn.md
@@ -3,7 +3,7 @@ Delgroupspawn
 Delete a group spawn.
 
 Usage: /delgroupspawn \<Group\><br>
-Aliases: delgroupspawn<br>
+Aliases: delgroupspawn, removegroupspawn<br>
 Module: [spawn](../modules/spawn.md)<br>
 
 Basic permission: uc.spawn.delgroupspawn.base<br>
diff --git a/docs/commands/delhome.md b/docs/commands/delhome.md
index bc2d73ba..471617af 100644
--- a/docs/commands/delhome.md
+++ b/docs/commands/delhome.md
@@ -2,7 +2,7 @@ Delhome
 ====
 Remove a home.
 
-Usage: /delhome \<Name\><br>
+Usage: /delhome \<Home\><br>
 Aliases: delhome, removehome<br>
 Module: [home](../modules/home.md)<br>
 
diff --git a/docs/commands/gamemode.md b/docs/commands/gamemode.md
index 02761481..b643c109 100644
--- a/docs/commands/gamemode.md
+++ b/docs/commands/gamemode.md
@@ -2,7 +2,7 @@ Gamemode
 ====
 Change a player's gamemode.
 
-Usage: /gamemode \<Survival/Creative/Adventure/Spectator\> \[Player\]<br>
+Usage: /gamemode \<Gamemode\> \[Player\]<br>
 Aliases: gamemode, gm<br>
 Module: [gamemode](../modules/gamemode.md)<br>
 
diff --git a/docs/commands/home.md b/docs/commands/home.md
index 54868ed6..f52662d9 100644
--- a/docs/commands/home.md
+++ b/docs/commands/home.md
@@ -2,7 +2,7 @@ Home
 ====
 Teleport to your home.
 
-Usage: /home \<Name\><br>
+Usage: /home \[Home\]<br>
 Aliases: home<br>
 Module: [home](../modules/home.md)<br>
 
diff --git a/docs/commands/itemcanbreak.md b/docs/commands/itemcanbreak.md
index 7371a79e..1af7377e 100644
--- a/docs/commands/itemcanbreak.md
+++ b/docs/commands/itemcanbreak.md
@@ -2,7 +2,7 @@ Itemcanbreak
 ====
 Change the blocks this item can break.
 
-Usage: /itemcanbreak \<Block\> \[Block\] \[Block\]...<br>
+Usage: /itemcanbreak \<Blocktypes…\><br>
 Aliases: itemcanbreak, setitemcanbreak, itemcandestroy, setitemcandestroy, canbreak, candestroy<br>
 Module: [item](../modules/item.md)<br>
 
diff --git a/docs/commands/itemcanplaceon.md b/docs/commands/itemcanplaceon.md
index 95229f63..620965e6 100644
--- a/docs/commands/itemcanplaceon.md
+++ b/docs/commands/itemcanplaceon.md
@@ -2,7 +2,7 @@ Itemcanplaceon
 ====
 Change the blocks this item can be placed on.
 
-Usage: /itemcanplaceon \<Block\> \[Block\] \[Block\]...<br>
+Usage: /itemcanplaceon \<Blocktypes…\><br>
 Aliases: itemcanplaceon, setitemcanplaceon, canplaceon<br>
 Module: [item](../modules/item.md)<br>
 
diff --git a/docs/commands/itemhidetags.md b/docs/commands/itemhidetags.md
index 02275481..8fd27dea 100644
--- a/docs/commands/itemhidetags.md
+++ b/docs/commands/itemhidetags.md
@@ -2,7 +2,7 @@ Itemhidetags
 ====
 Change whether a certain tag is hidden.
 
-Usage: /itemhidetags attributes/candestroy/canplace/enchantments/miscellaneous/unbreakable false/true<br>
+Usage: /itemhidetags attributes/candestroy/canplaceon/enchantments/miscellaneous/unbreakable Enable/Disable<br>
 Aliases: itemhidetags, setitemhidetags, hidetags<br>
 Module: [item](../modules/item.md)<br>
 
diff --git a/docs/commands/itemlore.md b/docs/commands/itemlore.md
index d788810d..5220fb0d 100644
--- a/docs/commands/itemlore.md
+++ b/docs/commands/itemlore.md
@@ -2,7 +2,7 @@ Itemlore
 ====
 Change the lore of the item in your hand. Use | for multiple lines.
 
-Usage: /itemlore \<Lore\>\[|LORE\]\[|LORE\]<br>
+Usage: /itemlore \<Lore…\><br>
 Aliases: itemlore, setitemlore, lore<br>
 Module: [item](../modules/item.md)<br>
 
diff --git a/docs/commands/itemname.md b/docs/commands/itemname.md
index d04debb9..56913c79 100644
--- a/docs/commands/itemname.md
+++ b/docs/commands/itemname.md
@@ -2,7 +2,7 @@ Itemname
 ====
 Change the name of the item in your hand.
 
-Usage: /itemname \<Name\><br>
+Usage: /itemname \<Name…\><br>
 Aliases: itemname, setitemname, name<br>
 Module: [item](../modules/item.md)<br>
 
diff --git a/docs/commands/itemunbreakable.md b/docs/commands/itemunbreakable.md
index e25ebc8e..0d7871b2 100644
--- a/docs/commands/itemunbreakable.md
+++ b/docs/commands/itemunbreakable.md
@@ -2,7 +2,7 @@ Itemunbreakable
 ====
 Change whether the item in your hand is unbreakable.
 
-Usage: /itemunbreakable true/false<br>
+Usage: /itemunbreakable \<Enabled/disabled\><br>
 Aliases: itemunbreakable, setitemunbreakable, unbreakable<br>
 Module: [item](../modules/item.md)<br>
 
diff --git a/docs/commands/jail.md b/docs/commands/jail.md
index 108d2605..35487bf3 100644
--- a/docs/commands/jail.md
+++ b/docs/commands/jail.md
@@ -2,7 +2,7 @@ Jail
 ====
 Jail a player in a certain jail, for a certain time and with a certain reason.
 
-Usage: /jail \<Player\> \[Jail\] \[Time\] \[Reason\]<br>
+Usage: /jail \<Player\> \[Jail\] \[Time\] \[Reason…\]<br>
 Aliases: jail<br>
 Module: [jail](../modules/jail.md)<br>
 
diff --git a/docs/commands/kick.md b/docs/commands/kick.md
index c55120b6..dc9eeb5d 100644
--- a/docs/commands/kick.md
+++ b/docs/commands/kick.md
@@ -2,7 +2,7 @@ Kick
 ====
 Kick a player from the server.
 
-Usage: /kick \<Player\> \[Reason\]<br>
+Usage: /kick \<Player\> \[Reason…\]<br>
 Aliases: kick<br>
 Module: [kick](../modules/kick.md)<br>
 
diff --git a/docs/commands/kickall.md b/docs/commands/kickall.md
index c96e26f5..56ce8d2b 100644
--- a/docs/commands/kickall.md
+++ b/docs/commands/kickall.md
@@ -2,7 +2,7 @@ Kickall
 ====
 Kick all players from the server.
 
-Usage: /kickall \[Reason\]<br>
+Usage: /kickall \[Reason…\]<br>
 Aliases: kickall, kickeveryone<br>
 Module: [kick](../modules/kick.md)<br>
 
diff --git a/docs/commands/kit.md b/docs/commands/kit.md
index e0f524f6..0d21a822 100644
--- a/docs/commands/kit.md
+++ b/docs/commands/kit.md
@@ -2,7 +2,7 @@ Kit
 ====
 Use a certain kit.
 
-Usage: /kit \<Kit\><br>
+Usage: /kit \[Kit\]<br>
 Aliases: kit<br>
 Module: [kit](../modules/kit.md)<br>
 
diff --git a/docs/commands/messagespy.md b/docs/commands/messagespy.md
index cd3e9002..71339827 100644
--- a/docs/commands/messagespy.md
+++ b/docs/commands/messagespy.md
@@ -2,7 +2,7 @@ Messagespy
 ====
 Toggle a player's or your own commandspy status. When commandspy is enabled you can see when other people whisper.
 
-Usage: /commandspy \[Player\]<br>
+Usage: /messagespy \[Player\]<br>
 Aliases: messagespy, msgspy, spymessage, spymsg, whisperspy, spywhisper<br>
 Module: [spy](../modules/spy.md)<br>
 
diff --git a/docs/commands/mute.md b/docs/commands/mute.md
index 60e63694..5fb43200 100644
--- a/docs/commands/mute.md
+++ b/docs/commands/mute.md
@@ -2,15 +2,15 @@ Mute
 ====
 Mute a player, for a certain time and reason.
 
-Usage: /mute \<Player\> \[Time\] \[Reason\]<br>
-Aliases: unmute<br>
+Usage: /mute \<Player\> \[Time\] \[Reason…\]<br>
+Aliases: mute<br>
 Module: [mute](../modules/mute.md)<br>
 
-Basic permission: uc.mute.unmute.base<br>
+Basic permission: uc.mute.mute.base<br>
 Basic role: mod<br>
 
 Permissions: <br>
-* **uc.mute.unmute.base** - Recommended role: mod<br>Allows you to unmute someone.
+* **uc.mute.mute.base** - Recommended role: mod<br>Allows you to mute someone.
 
 Permission options: <br>
 * **uc.mute.exemptpower**<br>The amount of exemptpower the player has. If a player's mutepower is higher than or equal to the targets exemptpower he can mute the target.
diff --git a/docs/commands/personalmessage.md b/docs/commands/personalmessage.md
index cb640166..34793b0b 100644
--- a/docs/commands/personalmessage.md
+++ b/docs/commands/personalmessage.md
@@ -2,7 +2,7 @@ Personalmessage
 ====
 Send a private message to an other player.
 
-Usage: /personalmessage \<Player\> \<Message\><br>
+Usage: /personalmessage \<Player\> \<Message…\><br>
 Aliases: personalmessage, pm, dm, msg, w, whisper, tell<br>
 Module: [personalmessage](../modules/personalmessage.md)<br>
 
diff --git a/docs/commands/random.md b/docs/commands/random.md
index 9b0d44b8..2bfa6246 100644
--- a/docs/commands/random.md
+++ b/docs/commands/random.md
@@ -2,7 +2,7 @@ Random
 ====
 Generate a random number between two values. If the minimum is not given it is set to 1.
 
-Usage: /random \[Min\] \<Max\><br>
+Usage: /random \<Min\> \[Second\]<br>
 Aliases: random<br>
 Module: [random](../modules/random.md)<br>
 
diff --git a/docs/commands/repair.md b/docs/commands/repair.md
index bc20bf16..e1a8802d 100644
--- a/docs/commands/repair.md
+++ b/docs/commands/repair.md
@@ -2,7 +2,7 @@ Repair
 ====
 Repair the item in your hand, or all items in your inventory.
 
-Usage: /repair \[All/Hand\]<br>
+Usage: /repair \[All\]<br>
 Aliases: repair, fix<br>
 Module: [item](../modules/item.md)<br>
 
diff --git a/docs/commands/reply.md b/docs/commands/reply.md
index 52dc091d..8a3188d5 100644
--- a/docs/commands/reply.md
+++ b/docs/commands/reply.md
@@ -2,7 +2,7 @@ Reply
 ====
 Send a private message to the person who last private messaged you.
 
-Usage: /reply \<Message\><br>
+Usage: /reply \<Message…\><br>
 Aliases: reply, respond, r<br>
 Module: [personalmessage](../modules/personalmessage.md)<br>
 
diff --git a/docs/commands/sethealth.md b/docs/commands/sethealth.md
index bbeb79c6..57a230c7 100644
--- a/docs/commands/sethealth.md
+++ b/docs/commands/sethealth.md
@@ -2,8 +2,8 @@ Sethealth
 ====
 Set the health of a player.
 
-Usage: /sethealth \<Amount\> \[Player\]<br>
-Aliases: sethealth, setlives<br>
+Usage: /sethealth \<Health\> \[Player\]<br>
+Aliases: sethealth, setlives, health, lives<br>
 Module: [heal](../modules/heal.md)<br>
 
 Basic permission: uc.heal.sethealth.base<br>
diff --git a/docs/commands/sethome.md b/docs/commands/sethome.md
index 4b5e3742..7ff5dc49 100644
--- a/docs/commands/sethome.md
+++ b/docs/commands/sethome.md
@@ -2,7 +2,7 @@ Sethome
 ====
 Set a new home or move the location of a home.
 
-Usage: /sethome \<Name\><br>
+Usage: /sethome \<Home\><br>
 Aliases: sethome, addhome<br>
 Module: [home](../modules/home.md)<br>
 
diff --git a/docs/commands/setjail.md b/docs/commands/setjail.md
index 29bfce9d..2b5479f1 100644
--- a/docs/commands/setjail.md
+++ b/docs/commands/setjail.md
@@ -2,7 +2,7 @@ Setjail
 ====
 Create a new jail with your current location.
 
-Usage: /setjail \<Jail\> \[Description\]<br>
+Usage: /setjail \<Jail\> \[Description…\]<br>
 Aliases: setjail, addjail, modifyjail<br>
 Module: [jail](../modules/jail.md)<br>
 
diff --git a/docs/commands/setmaxhealth.md b/docs/commands/setmaxhealth.md
index fe530cb3..921a5efb 100644
--- a/docs/commands/setmaxhealth.md
+++ b/docs/commands/setmaxhealth.md
@@ -2,8 +2,8 @@ Setmaxhealth
 ====
 Set the max health of a player.
 
-Usage: /setmaxhealth \<Amount\> \[Player\]<br>
-Aliases: setmaxhealth, maxhealth<br>
+Usage: /setmaxhealth \<Health\> \[Player\]<br>
+Aliases: setmaxhealth, setmaxlives, maxhealth, maxlives<br>
 Module: [heal](../modules/heal.md)<br>
 
 Basic permission: uc.heal.setmaxhealth.base<br>
diff --git a/docs/commands/setwarp.md b/docs/commands/setwarp.md
index fec59fac..386f9078 100644
--- a/docs/commands/setwarp.md
+++ b/docs/commands/setwarp.md
@@ -2,7 +2,7 @@ Setwarp
 ====
 Create a new warp with the specified name and description.
 
-Usage: /setwarp \<Name\> \[Description\]<br>
+Usage: /setwarp \<Name\> \[Description…\]<br>
 Aliases: setwarp, addwarp<br>
 Module: [warp](../modules/warp.md)<br>
 
diff --git a/docs/commands/sudo.md b/docs/commands/sudo.md
index 88424c7f..bb5b2519 100644
--- a/docs/commands/sudo.md
+++ b/docs/commands/sudo.md
@@ -2,7 +2,7 @@ Sudo
 ====
 Force a player to chat or to use a command.
 
-Usage: /sudo \<Player\> \[/\]\<Command/Message\><br>
+Usage: /sudo \<Player\> \<Command…\><br>
 Aliases: sudo, fcommand, fcmd, fchat, forcechat, forcecmd, forcecommand<br>
 Module: [sudo](../modules/sudo.md)<br>
 
diff --git a/docs/commands/teleportaccept.md b/docs/commands/teleportaccept.md
index 38ad21bb..5bb145b5 100644
--- a/docs/commands/teleportaccept.md
+++ b/docs/commands/teleportaccept.md
@@ -2,7 +2,7 @@ Teleportaccept
 ====
 Accept the specified request, or the most recent one.
 
-Usage: /tpaccept \[TPID/Player\]<br>
+Usage: /teleportaccept \[Tpid\]<br>
 Aliases: teleportaccept, tpaccept, tpyes<br>
 Module: [teleport](../modules/teleport.md)<br>
 
diff --git a/docs/commands/teleportdeny.md b/docs/commands/teleportdeny.md
index 1ffd58ed..50c08102 100644
--- a/docs/commands/teleportdeny.md
+++ b/docs/commands/teleportdeny.md
@@ -2,7 +2,7 @@ Teleportdeny
 ====
 Deny the specified request, or the most recent one.
 
-Usage: /tpdeny \[TPID/Player\]<br>
+Usage: /teleportdeny \[Tpid\]<br>
 Aliases: teleportdeny, tpdeny, tpno<br>
 Module: [teleport](../modules/teleport.md)<br>
 
diff --git a/docs/commands/ultimatecore.md b/docs/commands/ultimatecore.md
index edad15fd..9a958471 100644
--- a/docs/commands/ultimatecore.md
+++ b/docs/commands/ultimatecore.md
@@ -2,12 +2,18 @@ Ultimatecore
 ====
 The UltimateCore base command.
 
-Usage: /ultimatecore modules/resetuser/clearcache/gendocs/reload<br>
+Usage: /ultimatecore gendocs|reload|clearcache|resetuser|error|modules<br>
 Aliases: ultimatecore, uc<br>
 Module: [default](../modules/default.md)<br>
 
-Basic permission: uc.ultimatecore.ultimatecore<br>
+Basic permission: uc.default.ultimatecore.base<br>
 Basic role: owner<br>
 
 Permissions: <br>
-* **uc.ultimatecore.ultimatecore** - Recommended role: owner<br>Allows you to use the /ultimatecore command.
+* **uc.default.ultimatecore.base** - Recommended role: owner<br>Allows you to use the /ultimatecore command.
+* **uc.default.ultimatecore.clearcache.base** - Recommended role: nobody<br>Allows you to use the /clearcache command.
+* **uc.default.ultimatecore.resetuser.base** - Recommended role: nobody<br>Allows you to use the /resetuser command.
+* **uc.default.ultimatecore.modules.base** - Recommended role: nobody<br>Allows you to use the /modules command.
+* **uc.default.ultimatecore.gendocs.base** - Recommended role: nobody<br>Allows you to use the /gendocs command.
+* **uc.default.ultimatecore.error.base** - Recommended role: nobody<br>Allows you to use the /error command.
+* **uc.default.ultimatecore.reload.base** - Recommended role: nobody<br>Allows you to use the /reload command.
diff --git a/docs/commands/undeaf.md b/docs/commands/undeaf.md
new file mode 100644
index 00000000..df51bf97
--- /dev/null
+++ b/docs/commands/undeaf.md
@@ -0,0 +1,13 @@
+Undeaf
+====
+Make a player no longer deaf.
+
+Usage: /undeaf \<Player\><br>
+Aliases: undeaf<br>
+Module: [deaf](../modules/deaf.md)<br>
+
+Basic permission: uc.deaf.undeaf.base<br>
+Basic role: mod<br>
+
+Permissions: <br>
+* **uc.deaf.undeaf.base** - Recommended role: mod<br>Allows you to undeaf someone.
diff --git a/docs/commands/unmute.md b/docs/commands/unmute.md
new file mode 100644
index 00000000..a928b2eb
--- /dev/null
+++ b/docs/commands/unmute.md
@@ -0,0 +1,13 @@
+Unmute
+====
+Unmute a player.
+
+Usage: /unmute \<Player\><br>
+Aliases: unmute<br>
+Module: [mute](../modules/mute.md)<br>
+
+Basic permission: uc.mute.unmute.base<br>
+Basic role: mod<br>
+
+Permissions: <br>
+* **uc.mute.unmute.base** - Recommended role: mod<br>Allows you to unmute someone.
diff --git a/docs/commands/vanish.md b/docs/commands/vanish.md
index 41564d7b..b32656ef 100644
--- a/docs/commands/vanish.md
+++ b/docs/commands/vanish.md
@@ -11,4 +11,4 @@ Basic role: everyone<br>
 
 Permissions: <br>
 * **uc.vanish.vanish.base** - Recommended role: everyone<br>Allows you to use the vanish command.
-* **uc.vanish.vanish.base** - Recommended role: everyone<br>Allows you to use the vanish command on other players.
+* **uc.vanish.vanish.base** - Recommended role: everyone<br>Allows you to use the vanish command.
diff --git a/docs/commands/warp.md b/docs/commands/warp.md
index d733f80d..f895ff8f 100644
--- a/docs/commands/warp.md
+++ b/docs/commands/warp.md
@@ -2,7 +2,7 @@ Warp
 ====
 Teleport yourself to the specified warp.
 
-Usage: /warp \<Warp\><br>
+Usage: /warp \[Warp\]<br>
 Aliases: warp<br>
 Module: [warp](../modules/warp.md)<br>
 
diff --git a/docs/commands/weather.md b/docs/commands/weather.md
index 550ab2f7..0aa7069a 100644
--- a/docs/commands/weather.md
+++ b/docs/commands/weather.md
@@ -2,7 +2,7 @@ Weather
 ====
 Change the weather to sun, rain or thunder.
 
-Usage: /weather \<Sun/Rain/Thunder\> \[World\]<br>
+Usage: /weather sun/rain/thunder \[World\]<br>
 Aliases: weather, downfall<br>
 Module: [weather](../modules/weather.md)<br>
 
diff --git a/docs/modules.md b/docs/modules.md
index 13e4f8f2..930e1c6c 100644
--- a/docs/modules.md
+++ b/docs/modules.md
@@ -6,6 +6,7 @@ Modules
 [back - Teleport back to where you were before you teleported to somewhere.](modules/back.md)<br>
 [blacklist - Ban items from being used by players.](modules/blacklist.md)<br>
 [blood - Custom 'blood' particles when a player gets damaged](modules/blood.md)<br>
+[broadcast - Broadcast custom messages over the server.](modules/broadcast.md)<br>
 [burn - Set a player on fire using the /burn command.](modules/burn.md)<br>
 [chat - Full chat management, including group formats](modules/chat.md)<br>
 [connectionmessages - Allows you to change the join and quit messages.](modules/connectionmessages.md)<br>
@@ -19,6 +20,7 @@ Modules
 [god - Allows you to make a player invincible.](modules/god.md)<br>
 [heal - Allows you to refill or change a player's health bar.](modules/heal.md)<br>
 [home - Allows players set custom locations 'homes' where they can later teleport back to.](modules/home.md)<br>
+[inventory - Inventory management.](modules/inventory.md)<br>
 [item - Modify items in multiple ways.](modules/item.md)<br>
 [jail - Put players in a jail as a punishment for misbehaving.](modules/jail.md)<br>
 [kick - ALlows you to kick a player from the server.](modules/kick.md)<br>
diff --git a/docs/modules/afk.md b/docs/modules/afk.md
index a5649895..6b77ba66 100644
--- a/docs/modules/afk.md
+++ b/docs/modules/afk.md
@@ -3,11 +3,11 @@ Afk
 Management of what happens to idle players.
 
 Commands: <br>
-* **[/afk \[Player\] \[Message\]](../commands/afk.md)**<br>Toggle whether a player is marked as away-from-keyboard.
+* **[/afk \[Player\] \[Message…\]](../commands/afk.md)**<br>Toggle whether a player is marked as away-from-keyboard.
 
 Permissions: <br>
 * **uc.afk.afk.base** - Recommended role: everyone<br>Allows you to toggle your own afk status.
-* **uc.afk.afk.base.message** - Recommended role: everyone<br>Allows you to provide a reason for being afk.
-* **uc.afk.afk.others** - Recommended role: mod<br>Allows you to toggle another player's afk status.
+* **uc.afk.afk.message** - Recommended role: everyone<br>Allows you to provide a reason for being afk.
+* **uc.afk.afk.others.base** - Recommended role: mod<br>Allows you to toggle another player's afk status.
 * **uc.afk.afk.others.message** - Recommended role: mod<br>Allows you to provide an message while toggling another player's afk status.
 * **uc.afk.exempt** - Recommended role: vip<br>When you have this permission you can't be kicked for being afk.
diff --git a/docs/modules/broadcast.md b/docs/modules/broadcast.md
new file mode 100644
index 00000000..bca333d4
--- /dev/null
+++ b/docs/modules/broadcast.md
@@ -0,0 +1,9 @@
+Broadcast
+====
+Broadcast custom messages over the server.
+
+Commands: <br>
+* **[/broadcast \<Message…\>](../commands/broadcast.md)**<br>Send a message to everyone on the server.
+
+Permissions: <br>
+* **uc.broadcast.broadcast.base** - Recommended role: admin<br>Allows you to use the /broadcast command.
diff --git a/docs/modules/deaf.md b/docs/modules/deaf.md
index 582617f6..707b951d 100644
--- a/docs/modules/deaf.md
+++ b/docs/modules/deaf.md
@@ -3,8 +3,8 @@ Deaf
 Allows you to make a player deaf. The player won't be able to send chat and see the chat.
 
 Commands: <br>
-* **[/deaf \<Player\> \[Time\] \[Reason\]](../commands/deaf.md)**<br>Make a player deaf, for a certain time and reason.
-* **[/deaf \<Player\> \[Time\] \[Reason\]](../commands/deaf.md)**<br>Make a player deaf, for a certain time and reason.
+* **[/deaf \<Player\> \[Time\] \[Reason…\]](../commands/deaf.md)**<br>Make a player deaf, for a certain time and reason.
+* **[/undeaf \<Player\>](../commands/undeaf.md)**<br>Make a player no longer deaf.
 
 Permissions: <br>
 * **uc.deaf.deaf.base** - Recommended role: mod<br>Allows you to deaf someone.
diff --git a/docs/modules/default.md b/docs/modules/default.md
index 1bf5a712..bcabdf66 100644
--- a/docs/modules/default.md
+++ b/docs/modules/default.md
@@ -3,7 +3,14 @@ Default
 The default module of ultimatecore containing the /ultimatecore command.
 
 Commands: <br>
-* **[/ultimatecore modules/resetuser/clearcache/gendocs/reload](../commands/ultimatecore.md)**<br>The UltimateCore base command.
+* **[/ultimatecore gendocs|reload|clearcache|resetuser|error|modules](../commands/ultimatecore.md)**<br>The UltimateCore base command.
 
 Permissions: <br>
-* **uc.ultimatecore.ultimatecore** - Recommended role: owner<br>Allows you to use the /ultimatecore command.
+* **uc.default.ultimatecore.gendocs.base** - Recommended role: nobody<br>Allows you to use the /gendocs command.
+* **uc.ultimatecore.ultimatecore.base** - Recommended role: owner<br>Allows you to use the /ultimatecore command.
+* **uc.default.ultimatecore.base** - Recommended role: owner<br>Allows you to use the /ultimatecore command.
+* **uc.default.ultimatecore.clearcache.base** - Recommended role: nobody<br>Allows you to use the /clearcache command.
+* **uc.default.ultimatecore.resetuser.base** - Recommended role: nobody<br>Allows you to use the /resetuser command.
+* **uc.default.ultimatecore.modules.base** - Recommended role: nobody<br>Allows you to use the /modules command.
+* **uc.default.ultimatecore.error.base** - Recommended role: nobody<br>Allows you to use the /error command.
+* **uc.default.ultimatecore.reload.base** - Recommended role: nobody<br>Allows you to use the /reload command.
diff --git a/docs/modules/gamemode.md b/docs/modules/gamemode.md
index 693ffdcc..7e48591b 100644
--- a/docs/modules/gamemode.md
+++ b/docs/modules/gamemode.md
@@ -3,7 +3,7 @@ Gamemode
 Allows you to change a player's gamemode.
 
 Commands: <br>
-* **[/gamemode \<Survival/Creative/Adventure/Spectator\> \[Player\]](../commands/gamemode.md)**<br>Change a player's gamemode.
+* **[/gamemode \<Gamemode\> \[Player\]](../commands/gamemode.md)**<br>Change a player's gamemode.
 * **[/survival \[Player\]](../commands/survival.md)**<br>Change someone's gamemode to survival.
 * **[/creative \[Player\]](../commands/creative.md)**<br>Change someone's gamemode to creative.
 * **[/adventure \[Player\]](../commands/adventure.md)**<br>Change someone's gamemode to adventure.
diff --git a/docs/modules/heal.md b/docs/modules/heal.md
index 4e928058..a69ec65d 100644
--- a/docs/modules/heal.md
+++ b/docs/modules/heal.md
@@ -4,8 +4,8 @@ Allows you to refill or change a player's health bar.
 
 Commands: <br>
 * **[/heal \[Player\]](../commands/heal.md)**<br>Heal a player.
-* **[/sethealth \<Amount\> \[Player\]](../commands/sethealth.md)**<br>Set the health of a player.
-* **[/setmaxhealth \<Amount\> \[Player\]](../commands/setmaxhealth.md)**<br>Set the max health of a player.
+* **[/sethealth \<Health\> \[Player\]](../commands/sethealth.md)**<br>Set the health of a player.
+* **[/setmaxhealth \<Health\> \[Player\]](../commands/setmaxhealth.md)**<br>Set the max health of a player.
 
 Permissions: <br>
 * **uc.heal.heal.base** - Recommended role: admin<br>Allows you to use the heal command.
diff --git a/docs/modules/home.md b/docs/modules/home.md
index ad8827c2..52c310ec 100644
--- a/docs/modules/home.md
+++ b/docs/modules/home.md
@@ -4,9 +4,9 @@ Allows players set custom locations 'homes' where they can later teleport back t
 
 Commands: <br>
 * **[/homelist](../commands/homelist.md)**<br>View a list of your homes.
-* **[/home \<Name\>](../commands/home.md)**<br>Teleport to your home.
-* **[/delhome \<Name\>](../commands/delhome.md)**<br>Remove a home.
-* **[/sethome \<Name\>](../commands/sethome.md)**<br>Set a new home or move the location of a home.
+* **[/home \[Home\]](../commands/home.md)**<br>Teleport to your home.
+* **[/delhome \<Home\>](../commands/delhome.md)**<br>Remove a home.
+* **[/sethome \<Home\>](../commands/sethome.md)**<br>Set a new home or move the location of a home.
 
 Permissions: <br>
 * **uc.home.home.base** - Recommended role: everyone<br>Allows you to teleport to your own home.
diff --git a/docs/modules/inventory.md b/docs/modules/inventory.md
new file mode 100644
index 00000000..f370ce9f
--- /dev/null
+++ b/docs/modules/inventory.md
@@ -0,0 +1,10 @@
+Inventory
+====
+Inventory management.
+
+Commands: <br>
+* **[/clearinventory \[Player\]](../commands/clearinventory.md)**<br>Remove all items from someone's inventory.
+
+Permissions: <br>
+* **uc.inventory.clearinventory.base** - Recommended role: admin<br>Allows you to use the /clearinventory command.
+* **others** - Recommended role: admin<br>Allows you to use the /clearinventory command on other players
diff --git a/docs/modules/item.md b/docs/modules/item.md
index 5dfdc75c..adefe383 100644
--- a/docs/modules/item.md
+++ b/docs/modules/item.md
@@ -4,15 +4,15 @@ Modify items in multiple ways.
 
 Commands: <br>
 * **[/more](../commands/more.md)**<br>Set the quantity of the item in your hand to the maximum.
-* **[/repair \[All/Hand\]](../commands/repair.md)**<br>Repair the item in your hand, or all items in your inventory.
-* **[/itemname \<Name\>](../commands/itemname.md)**<br>Change the name of the item in your hand.
-* **[/itemlore \<Lore\>\[|LORE\]\[|LORE\]](../commands/itemlore.md)**<br>Change the lore of the item in your hand. Use | for multiple lines.
+* **[/repair \[All\]](../commands/repair.md)**<br>Repair the item in your hand, or all items in your inventory.
+* **[/itemname \<Name…\>](../commands/itemname.md)**<br>Change the name of the item in your hand.
+* **[/itemlore \<Lore…\>](../commands/itemlore.md)**<br>Change the lore of the item in your hand. Use | for multiple lines.
 * **[/itemquantity \<Quantity\>](../commands/itemquantity.md)**<br>Change the quantity of the item in your hand.
 * **[/itemdurability \<Durability\>](../commands/itemdurability.md)**<br>Change the durability of the item in your hand.
-* **[/itemunbreakable true/false](../commands/itemunbreakable.md)**<br>Change whether the item in your hand is unbreakable.
-* **[/itemcanbreak \<Block\> \[Block\] \[Block\]...](../commands/itemcanbreak.md)**<br>Change the blocks this item can break.
-* **[/itemcanplaceon \<Block\> \[Block\] \[Block\]...](../commands/itemcanplaceon.md)**<br>Change the blocks this item can be placed on.
-* **[/itemhidetags attributes/candestroy/canplace/enchantments/miscellaneous/unbreakable false/true](../commands/itemhidetags.md)**<br>Change whether a certain tag is hidden.
+* **[/itemunbreakable \<Enabled/disabled\>](../commands/itemunbreakable.md)**<br>Change whether the item in your hand is unbreakable.
+* **[/itemcanbreak \<Blocktypes…\>](../commands/itemcanbreak.md)**<br>Change the blocks this item can break.
+* **[/itemcanplaceon \<Blocktypes…\>](../commands/itemcanplaceon.md)**<br>Change the blocks this item can be placed on.
+* **[/itemhidetags attributes/candestroy/canplaceon/enchantments/miscellaneous/unbreakable Enable/Disable](../commands/itemhidetags.md)**<br>Change whether a certain tag is hidden.
 * **[/itemenchant \<Enchantment\> \[Level\]](../commands/itemenchant.md)**<br>Add an enchantment to the item in your hand.
 
 Permissions: <br>
diff --git a/docs/modules/jail.md b/docs/modules/jail.md
index 9ec712ad..4c7e870f 100644
--- a/docs/modules/jail.md
+++ b/docs/modules/jail.md
@@ -3,10 +3,10 @@ Jail
 Put players in a jail as a punishment for misbehaving.
 
 Commands: <br>
-* **[/setjail \<Jail\> \[Description\]](../commands/setjail.md)**<br>Create a new jail with your current location.
+* **[/setjail \<Jail\> \[Description…\]](../commands/setjail.md)**<br>Create a new jail with your current location.
 * **[/deljail \<Jail\>](../commands/deljail.md)**<br>Remove the jail with the provided name.
 * **[/jaillist](../commands/jaillist.md)**<br>View a list of all jails.
-* **[/jail \<Player\> \[Jail\] \[Time\] \[Reason\]](../commands/jail.md)**<br>Jail a player in a certain jail, for a certain time and with a certain reason.
+* **[/jail \<Player\> \[Jail\] \[Time\] \[Reason…\]](../commands/jail.md)**<br>Jail a player in a certain jail, for a certain time and with a certain reason.
 * **[/unjail \<Player\>](../commands/unjail.md)**<br>Unjail a player.
 * **[/jailtp \<Jail\>](../commands/jailtp.md)**<br>Teleport to a jail without jailing yourself.
 
diff --git a/docs/modules/kick.md b/docs/modules/kick.md
index 6f6f1697..c098e94b 100644
--- a/docs/modules/kick.md
+++ b/docs/modules/kick.md
@@ -3,8 +3,8 @@ Kick
 ALlows you to kick a player from the server.
 
 Commands: <br>
-* **[/kick \<Player\> \[Reason\]](../commands/kick.md)**<br>Kick a player from the server.
-* **[/kickall \[Reason\]](../commands/kickall.md)**<br>Kick all players from the server.
+* **[/kick \<Player\> \[Reason…\]](../commands/kick.md)**<br>Kick a player from the server.
+* **[/kickall \[Reason…\]](../commands/kickall.md)**<br>Kick all players from the server.
 
 Permissions: <br>
 * **uc.kick.kick.base** - Recommended role: mod<br>Allows you to use the kick command.
diff --git a/docs/modules/kit.md b/docs/modules/kit.md
index 2c2e9ce6..9943d444 100644
--- a/docs/modules/kit.md
+++ b/docs/modules/kit.md
@@ -3,9 +3,9 @@ Kit
 Give players certain items on use of a command.
 
 Commands: <br>
-* **[/kit \<Kit\>](../commands/kit.md)**<br>Use a certain kit.
+* **[/kit \[Kit\]](../commands/kit.md)**<br>Use a certain kit.
 * **[/kitlist](../commands/kitlist.md)**<br>Get a paginated list of all kits.
-* **[/createkit \<Name\> \[Time\] \[Description\]](../commands/createkit.md)**<br>Create a kit with the contents of your inventory.
+* **[/createkit \<Name\> \[Cooldown\] \[Description…\]](../commands/createkit.md)**<br>Create a kit with the contents of your inventory.
 * **[/removekit \<Kit\>](../commands/removekit.md)**<br>Permanently delete a kit.
 
 Permissions: <br>
diff --git a/docs/modules/mute.md b/docs/modules/mute.md
index db093b0c..447088c7 100644
--- a/docs/modules/mute.md
+++ b/docs/modules/mute.md
@@ -3,8 +3,8 @@ Mute
 Allows you to mute a player and the player won't be able to send chat, but will be able to see the chat.
 
 Commands: <br>
-* **[/mute \<Player\> \[Time\] \[Reason\]](../commands/mute.md)**<br>Mute a player, for a certain time and reason.
-* **[/mute \<Player\> \[Time\] \[Reason\]](../commands/mute.md)**<br>Mute a player, for a certain time and reason.
+* **[/mute \<Player\> \[Time\] \[Reason…\]](../commands/mute.md)**<br>Mute a player, for a certain time and reason.
+* **[/unmute \<Player\>](../commands/unmute.md)**<br>Unmute a player.
 
 Permissions: <br>
 * **uc.mute.mute.base** - Recommended role: mod<br>Allows you to mute someone.
diff --git a/docs/modules/personalmessage.md b/docs/modules/personalmessage.md
index 4495728b..d63070c3 100644
--- a/docs/modules/personalmessage.md
+++ b/docs/modules/personalmessage.md
@@ -3,8 +3,8 @@ Personalmessage
 Send private messages to other players.
 
 Commands: <br>
-* **[/personalmessage \<Player\> \<Message\>](../commands/personalmessage.md)**<br>Send a private message to an other player.
-* **[/reply \<Message\>](../commands/reply.md)**<br>Send a private message to the person who last private messaged you.
+* **[/personalmessage \<Player\> \<Message…\>](../commands/personalmessage.md)**<br>Send a private message to an other player.
+* **[/reply \<Message…\>](../commands/reply.md)**<br>Send a private message to the person who last private messaged you.
 
 Permissions: <br>
 * **uc.personalmessage.personalmessage.base** - Recommended role: everyone<br>Allows you to send private messages to people.
diff --git a/docs/modules/random.md b/docs/modules/random.md
index c2cc877e..4538f10f 100644
--- a/docs/modules/random.md
+++ b/docs/modules/random.md
@@ -3,7 +3,7 @@ Random
 Generate random numbers with a simple command
 
 Commands: <br>
-* **[/random \[Min\] \<Max\>](../commands/random.md)**<br>Generate a random number between two values. If the minimum is not given it is set to 1.
+* **[/random \<Min\> \[Second\]](../commands/random.md)**<br>Generate a random number between two values. If the minimum is not given it is set to 1.
 
 Permissions: <br>
 * **uc.random.random.base** - Recommended role: everyone<br>Allows you to use the random command.
diff --git a/docs/modules/spy.md b/docs/modules/spy.md
index 9ccc286c..1c6c4512 100644
--- a/docs/modules/spy.md
+++ b/docs/modules/spy.md
@@ -4,7 +4,7 @@ Ability to see other people's private messages and command usage.
 
 Commands: <br>
 * **[/commandspy \[Player\]](../commands/commandspy.md)**<br>Toggle a player's or your own commandspy status. When commandspy is enabled you can see when other people use commands.
-* **[/commandspy \[Player\]](../commands/messagespy.md)**<br>Toggle a player's or your own commandspy status. When commandspy is enabled you can see when other people whisper.
+* **[/messagespy \[Player\]](../commands/messagespy.md)**<br>Toggle a player's or your own commandspy status. When commandspy is enabled you can see when other people whisper.
 
 Permissions: <br>
 * **uc.spy.commandspy.base** - Recommended role: mod<br>Allows you to toggle whether your commandspy is enabled.
diff --git a/docs/modules/sudo.md b/docs/modules/sudo.md
index 4d0fc0da..6ede34a3 100644
--- a/docs/modules/sudo.md
+++ b/docs/modules/sudo.md
@@ -3,7 +3,7 @@ Sudo
 Force a player to run a command.
 
 Commands: <br>
-* **[/sudo \<Player\> \[/\]\<Command/Message\>](../commands/sudo.md)**<br>Force a player to chat or to use a command.
+* **[/sudo \<Player\> \<Command…\>](../commands/sudo.md)**<br>Force a player to chat or to use a command.
 
 Permissions: <br>
 * **uc.sudo.sudo.base** - Recommended role: admin<br>Allows you to use the sudo command for both chatting and commands.
diff --git a/docs/modules/teleport.md b/docs/modules/teleport.md
index aef37c29..bf5ac860 100644
--- a/docs/modules/teleport.md
+++ b/docs/modules/teleport.md
@@ -5,8 +5,8 @@ A module with multiple teleport command.
 Commands: <br>
 * **[/teleportask \<Player\>](../commands/teleportask.md)**<br>Ask to teleport to a player.
 * **[/teleportaskhere \<Player\>](../commands/teleportaskhere.md)**<br>Ask to teleport a player to you.
-* **[/tpaccept \[TPID/Player\]](../commands/teleportaccept.md)**<br>Accept the specified request, or the most recent one.
-* **[/tpdeny \[TPID/Player\]](../commands/teleportdeny.md)**<br>Deny the specified request, or the most recent one.
+* **[/teleportaccept \[Tpid\]](../commands/teleportaccept.md)**<br>Accept the specified request, or the most recent one.
+* **[/teleportdeny \[Tpid\]](../commands/teleportdeny.md)**<br>Deny the specified request, or the most recent one.
 * **[/teleport \[Player\] \<Player\> OR /teleport \[Player\] \<X\> \[Y\] \<Z\> \[\<Yaw\> \<Pitch\>\]](../commands/teleport.md)**<br>Teleport a player or yourself to another player or certain coordinates.
 
 Permissions: <br>
diff --git a/docs/modules/vanish.md b/docs/modules/vanish.md
index 7ffdeaab..8cdcecb4 100644
--- a/docs/modules/vanish.md
+++ b/docs/modules/vanish.md
@@ -7,4 +7,3 @@ Commands: <br>
 
 Permissions: <br>
 * **uc.vanish.vanish.base** - Recommended role: everyone<br>Allows you to use the vanish command.
-* **uc.vanish.vanish.base** - Recommended role: everyone<br>Allows you to use the vanish command on other players.
diff --git a/docs/modules/warp.md b/docs/modules/warp.md
index fa408da5..dbaa8d6d 100644
--- a/docs/modules/warp.md
+++ b/docs/modules/warp.md
@@ -3,8 +3,8 @@ Warp
 Let the admin set certain locations where a player can teleport to.
 
 Commands: <br>
-* **[/warp \<Warp\>](../commands/warp.md)**<br>Teleport yourself to the specified warp.
-* **[/setwarp \<Name\> \[Description\]](../commands/setwarp.md)**<br>Create a new warp with the specified name and description.
+* **[/warp \[Warp\]](../commands/warp.md)**<br>Teleport yourself to the specified warp.
+* **[/setwarp \<Name\> \[Description…\]](../commands/setwarp.md)**<br>Create a new warp with the specified name and description.
 * **[/delwarp \<Warp\>](../commands/delwarp.md)**<br>Remove the specified warp.
 * **[/warplist](../commands/warplist.md)**<br>Get a paginated list of all warps.
 
diff --git a/docs/modules/weather.md b/docs/modules/weather.md
index c187b5bb..0c1ece66 100644
--- a/docs/modules/weather.md
+++ b/docs/modules/weather.md
@@ -3,7 +3,7 @@ Weather
 Change the minecraft world's weather, or disable it.
 
 Commands: <br>
-* **[/weather \<Sun/Rain/Thunder\> \[World\]](../commands/weather.md)**<br>Change the weather to sun, rain or thunder.
+* **[/weather sun/rain/thunder \[World\]](../commands/weather.md)**<br>Change the weather to sun, rain or thunder.
 * **[/sun \[World\]](../commands/sun.md)**<br>Change the weather to sun.
 * **[/rain \[World\]](../commands/rain.md)**<br>Change the weather to rain.
 * **[/thunder \[World\]](../commands/thunder.md)**<br>Change the weather to thunder.
diff --git a/docs/permissions.md b/docs/permissions.md
index b9f92c95..6bd015fa 100644
--- a/docs/permissions.md
+++ b/docs/permissions.md
@@ -1,16 +1,25 @@
 Permissions
 ====
 
+others - Allows you to use the /clearinventory command on other players (Recommended for admin)<br>
 uc.afk.afk.base - Allows you to toggle your own afk status. (Recommended for everyone)<br>
-uc.afk.afk.base.message - Allows you to provide a reason for being afk. (Recommended for everyone)<br>
-uc.afk.afk.others - Allows you to toggle another player's afk status. (Recommended for mod)<br>
+uc.afk.afk.message - Allows you to provide a reason for being afk. (Recommended for everyone)<br>
+uc.afk.afk.others.base - Allows you to toggle another player's afk status. (Recommended for mod)<br>
 uc.afk.afk.others.message - Allows you to provide an message while toggling another player's afk status. (Recommended for mod)<br>
 uc.afk.exempt - When you have this permission you can't be kicked for being afk. (Recommended for vip)<br>
 uc.back.back.base - Allows you to use the back command. (Recommended for everyone)<br>
 uc.back.back.ondeath - Allows you to use the back command after you died. (Recommended for everyone)<br>
+uc.broadcast.broadcast.base - Allows you to use the /broadcast command. (Recommended for admin)<br>
 uc.burn.burn.base - Allows you to use the burn command. (Recommended for admin)<br>
 uc.deaf.deaf.base - Allows you to deaf someone. (Recommended for mod)<br>
 uc.deaf.undeaf.base - Allows you to undeaf someone. (Recommended for mod)<br>
+uc.default.ultimatecore.base - Allows you to use the /ultimatecore command. (Recommended for owner)<br>
+uc.default.ultimatecore.clearcache.base - Allows you to use the /clearcache command. (Recommended for nobody)<br>
+uc.default.ultimatecore.error.base - Allows you to use the /error command. (Recommended for nobody)<br>
+uc.default.ultimatecore.gendocs.base - Allows you to use the /gendocs command. (Recommended for nobody)<br>
+uc.default.ultimatecore.modules.base - Allows you to use the /modules command. (Recommended for nobody)<br>
+uc.default.ultimatecore.reload.base - Allows you to use the /reload command. (Recommended for nobody)<br>
+uc.default.ultimatecore.resetuser.base - Allows you to use the /resetuser command. (Recommended for nobody)<br>
 uc.fly.fly.base - Allows you to change your own fly state. (Recommended for admin)<br>
 uc.fly.fly.others - Allows you to change other player's fly state. (Recommended for admin)<br>
 uc.food.food.base - Allows you to use the food command. (Recommended for admin)<br>
@@ -38,6 +47,7 @@ uc.home.delhome.base - Allows you to remove one of your homes. (Recommended for
 uc.home.home.base - Allows you to teleport to your own home. (Recommended for everyone)<br>
 uc.home.sethome.base - Allows you to set your own home. (Recommended for everyone)<br>
 uc.home.sethome.unlimited - Allows you to set an unlimited amount of homes. (Recommended for vip)<br>
+uc.inventory.clearinventory.base - Allows you to use the /clearinventory command. (Recommended for admin)<br>
 uc.item.itemcanbreak.base - Allows you to use the itemcanbreak command. (Recommended for admin)<br>
 uc.item.itemcanplaceon.base - Allows you to use the itemcanplaceon command. (Recommended for admin)<br>
 uc.item.itemdurability.base - Allows you to use the itemdurability command. (Recommended for admin)<br>
@@ -117,9 +127,8 @@ uc.time.time.query.daytime - Allows you to query how many ticks have passed sinc
 uc.time.time.query.formatted - Allows you to see the formatted time. (Recommended for everyone)<br>
 uc.time.time.query.gametime - Allows you to use query how many ticks have passed in the server. (Recommended for admin)<br>
 uc.time.time.ticks - Allows you to set the time to a certain amount of ticks. (Recommended for admin)<br>
-uc.ultimatecore.ultimatecore - Allows you to use the /ultimatecore command. (Recommended for owner)<br>
+uc.ultimatecore.ultimatecore.base - Allows you to use the /ultimatecore command. (Recommended for owner)<br>
 uc.vanish.vanish.base - Allows you to use the vanish command. (Recommended for everyone)<br>
-uc.vanish.vanish.base - Allows you to use the vanish command on other players. (Recommended for everyone)<br>
 uc.warp.delwarp.base - Allows you to remove a warp. (Recommended for admin)<br>
 uc.warp.setwarp.base - Allows you to set a new warp. (Recommended for admin)<br>
 uc.warp.warp.[WARP] - Allows you to use a certain warp. (Recommended for everyone)<br>