diff --git a/README.txt b/README.txt
index ff2960f0..701121cb 100644
--- a/README.txt
+++ b/README.txt
@@ -13,6 +13,7 @@ use or not:
 - Block TNT explosions.
 - Block lighters from setting fires.
 - Block all fires.
+- Disable fall damage, lava damage, fire damage, and/or water damage.
 - Allow fire but prevent it from burning certain blocks.
 - Prevent lava from starting fires.
 - Restrict lava spreading to only some block types.
@@ -130,6 +131,12 @@ unsupported by your version of hMod.
     Kick players when they die (and respawn). This is to work around the
     issues of invisible players when players die.
     
+- disable-fall-damage (def. false)
+- disable-lava-damage (def. false)
+- disable-fire-damage (def. false)
+- disable-water-damage (def. false)
+    Disable various types of damage.
+    
 - log-console (def. true)
     For blacklist log actions, print to console.
 
@@ -217,6 +224,17 @@ certain rules apply to only some groups.
 Edit the included worldguard-blacklist.txt file and follow the
 instructions inside. The file comes with the download for WorldGuard.
 
+Other Features
+--------------
+
+To give someone invincibility every time s/he joins the server, create
+a wg-invincible group and add the group to the user or have the user's
+group inherit this group.
+
+To give someone the ability to breathe under water, create
+a wg-amphibious group and add the group to the user or have the user's
+group inherit this group.
+
 Thanks
 ------
 
diff --git a/worldguard.properties b/worldguard.properties
index 7321b595..eb9872fe 100644
--- a/worldguard.properties
+++ b/worldguard.properties
@@ -1,28 +1,43 @@
+#
+# WorldGuard configuration
+#
 # This is a starter copy of WorldGuard's configuration so you can configure
 # WorldGuard right from the beginning. Copy it into your server folder
 # (into where server.properties resides) and edit the file as your desire.
-# These comments will be lost whenever WorldGuard updates this file.
-# More detailed descriptions of the options can be found in README.txt!
+#
 
+# Display a summary of WorldGuard's core protection features (lava fire
+# disable and others) when Worldguard starts up.
 summary-on-start=true
 
 # Toggle the item durabiltiy fix
 item-durability=true
 
-# Simulate sponge
+# Simulate the sponge from Classic. It removes water and prevents water from
+# flowing into an area containing sponges. Use this to protect circuits
+# or to assist in underwater projects.
 simulate-sponge=false
 sponge-radius=3
 
-# Simulate classic water
+# Simulate classic water. Water will spread infinitely. Be aware that this
+# may likely flood your server.
 classic-water=false
 
-# Adjust physics
+# Allow the placement of portal blocks anyway.
 allow-portal-anywhere=false
+
+# Prevent gravel from falling.
 no-physics-gravel=false
+
+# Prevent sand from falling.
 no-physics-sand=false
 
-# Protection
+# Kick the older player if a player attempts to join again without first
+# logging out the first instance.
 enforce-single-session=true
+
+# List of items to destroy on drop. You can also accomplish this using
+# the blacklist.
 item-drop-blacklist=
 
 # Simple prevention
@@ -30,20 +45,43 @@ block-creepers=false
 block-lighter=false
 block-tnt=false
 
-# Health related
+# Login protection prevents players from getting any damage for a few
+# seconds after joining the server.
 login-protection=3
+
+# Spawn protection prevents players from getting any damage after spawning
+# (after dying).
 spawn-protection=0
+
+# This is an deprecated feature to fix a bug. This kicks a user once the
+# player dies and attemtps to respawn. The player can then still rejoin
+# and be alive.
 kick-on-death=false
 
-# Control fire
+# Disable various ways of damage. If you want to give someone invincibility
+# or the ability to breathe under water, create the groups wg-invincible
+# and wg-amphibious respectively and apply them to users as needed.
+disable-fall-damage=false
+disable-lava-damage=false
+disable-fire-damage=false
+disable-water-damage=false
+
+# Disable fire spreading between blocks. Note that this does not prevent
+# fire damage -- it only prevents fire spread.
 disable-all-fire-spread=false
+
+# List blocks that fire should not spread to or between. Cloth and wood
+# are some good examples.
 disallowed-fire-spread-blocks=
 
-# Disable lava fire and spread
+# Prevent lava from starting fires.
 disable-lava-fire=true
+
+# List of blocks that lava is allowed to spread onto.
 allowed-lava-spread-blocks=
 
-# Log/blacklist
+# Control where to log blacklist events to. You can use multiple log
+# methods as you please.
 log-console=true
 log-database-dsn=jdbc\:mysql\://localhost\:3306/minecraft
 log-database-pass=