diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 961c141362..f6466b566d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -696,12 +696,6 @@
     ;; then you might want to try setting this to false.
     ; mesh_sculpted_prim = true
 
-    ;# {use_NINJA_physics_joints} {[Startup]physics:OpenDynamicsEngine} {Use jointed (NINJA) physics?} {true false} false
-    ;; If you would like physics joints to be enabled through a special naming
-    ;; convention in the client, set this to true.
-    ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics)
-    ; use_NINJA_physics_joints = false
-
 [RemoteAdmin]
     ;; This is the remote admin module, which uses XMLRPC requests to
     ;; manage regions from a web interface.
@@ -1138,15 +1132,19 @@
 	
 	;; several options to control NPCs creation
 	
+    ;# {AllowNotOwned} {} {allow NPCs to be created not Owned} {true false} false
 	;; allow NPCs to be created not Owned {true false} default: true
     ; AllowNotOwned = false
 	
+    ;# {AllowSenseAsAvatar} {} {allow NPCs to set to be sensed as Avatars} {true false} false
 	;; allow NPCs to set to be sensed as Avatars {true false} default: true
     ; AllowSenseAsAvatar = false
 	
+    ;# {AllowCloneOtherAvatars} {} {allow NPCs to created cloning any avatar in region} {true false} false
 	;; allow NPCs to created cloning any avatar in region {true false} default: true
     ; AllowCloneOtherAvatars = false
 	
+    ;# {NoNPCGroup} {} {if true NPCs will have no group title, if false display "- NPC -"} {true false} false
 	;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
     ; NoNPCGroup = false 
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6b04424a87..906c7bc143 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -128,9 +128,16 @@
     ; Increasing this number will increase memory usage.
     MaxPrimUndos = 20
 
+    ; Minimum size for non-physical prims.This can be overridden in the region config file (as 
+    ; NonPhysicalPrimMin!).
+    ; NonPhysicalPrimMin = 0.001
+
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file (as NonPhysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
+    ; Minimum size where a prim can be physical. This can be overridden in the region config file.
+    ; PhysicalPrimMin = 0.01
+    
     ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file.
     PhysicalPrimMax = 64
 
@@ -304,6 +311,7 @@
     ; ## SCRIPT ENGINE
     ; ##
 
+    ;; Default script engine to use. Currently, we only have XEngine
     DefaultScriptEngine = "XEngine"
 
     ; Http proxy setting for llHTTPRequest and dynamic texture loading, if
@@ -320,7 +328,8 @@
     ; ##
     ; ## EMAIL MODULE
     ; ##
-
+    ;; The email module requires some configuration. It needs an SMTP
+    ;; server to send mail through.
     ;emailmodule = DefaultEmailModule
     
     ; ##
@@ -395,15 +404,23 @@
    
     
 [Map]
+    ; Map tile options.  
+    ; If true, then maptiles are generated using the MapImageModule below.
+    ; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overridden
+    ; in individual region config file(s).  If you do not want to upload map tiles at all, then you will need 
+    ; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
+    ;GenerateMaptiles = true
+
     ;WorldMapModule = "WorldMap"
+
+    ; The module to use in order to generate map images.
+    ; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can 
+    ; generate better images.   
     ;MapImageModule = "MapImageModule"
 
     ; World map blacklist timeout in seconds
     ;BlacklistTimeout = 600
 
-    ; Set to false to not generate any maptiles
-    ;GenerateMaptiles = true
-
     ; Refresh (in seconds) the map tile periodically
     ;MaptileRefresh = 0
 
@@ -431,6 +448,8 @@
     ; ## PERMISSIONS
     ; ##
 
+    ; Permission modules to use, separated by comma.
+    ; Possible modules are DefaultPermissionsModule, PrimLimitsModule
     ;permissionmodules = "DefaultPermissionsModule"
 
     ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
@@ -439,12 +458,22 @@
     ; Default is true
     serverside_object_permissions = true
 
-    allow_grid_gods = false
-
-    ; This allows somne control over permissions
+    
+    ; This allows some control over permissions
     ; please note that this still doesn't duplicate SL, and is not intended to
+    
+    ; This allows grid users with a UserLevel of 200 or more to assume god
+    ; powers in the regions in this simulator.    
+    allow_grid_gods = false
+    
+    ; Allow region owners to assume god powers in their regions
     ;region_owner_is_god = true
+
+    ; Allow region managers to assume god powers in regions they manage
     ;region_manager_is_god = false
+
+    ; Allow parcel owners to assume god powers in their parcels    
+    ; you really may not want this...
     ;parcel_owner_is_god = false
 
     ; Control user types that are allowed to create new scripts
@@ -1107,16 +1136,6 @@
     ; number^2 physical level of detail of the sculpt texture.  16x16 - 256 verticies
     mesh_physical_lod = 16
 
-    ; ##
-    ; ## Joint support
-    ; ##
-
-    ; If you would like physics joints to be enabled through a special naming
-    ;   convention in the client, set this to true.
-    ;   (See NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
-    ; Default is false
-    ;use_NINJA_physics_joints = true
-
     ; ##
     ; ## additional meshing options
     ; ##
@@ -1126,7 +1145,7 @@
     ;   If you would rather have mesh proxies for simple prims, you can set this to
     ;   true. Note that this will increase memory usage and region startup time.
     ; Default is false.
-    ;force_simple_prim_meshing = true
+    ;force_simple_prim_meshing = false
 
 
 [BulletSim]
@@ -2104,7 +2123,19 @@
 [NPC]
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
-
+	;; several options to control NPCs creation
+	
+	;; allow NPCs to be created not Owned {true false} default: true
+    ; AllowNotOwned = false
+	
+	;; allow NPCs to set to be sensed as Avatars {true false} default: true
+    ; AllowSenseAsAvatar = false
+	
+	;; allow NPCs to created cloning any avatar in region {true false} default: true
+    ; AllowCloneOtherAvatars = false
+	
+	;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
+    ; NoNPCGroup = false 
 
 [Terrain]
     ; Values can be "pinhead-island" or "flat"