diff --git a/libsecondlife-cs/NetworkManager.cs b/libsecondlife-cs/NetworkManager.cs
index 1cb7a617..275e24d7 100644
--- a/libsecondlife-cs/NetworkManager.cs
+++ b/libsecondlife-cs/NetworkManager.cs
@@ -1168,6 +1168,8 @@ namespace libsecondlife
         /// </summary>
         private void Shutdown()
         {
+            Client.Log("NetworkManager shutdown initiated", Helpers.LogLevel.Info);
+
             lock (Simulators)
             {
                 // Disconnect all simulators except the current one
diff --git a/libsecondlife-cs/ObjectManager.cs b/libsecondlife-cs/ObjectManager.cs
index 0637a2d9..a4680ecc 100644
--- a/libsecondlife-cs/ObjectManager.cs
+++ b/libsecondlife-cs/ObjectManager.cs
@@ -150,8 +150,11 @@ namespace libsecondlife
         /// </summary>
         public enum PermissionWho
         {
+            /// <summary></summary>
             Group = 4,
+            /// <summary></summary>
             Everyone = 8,
+            /// <summary></summary>
             NextOwner = 16
         }
 
@@ -161,46 +164,151 @@ namespace libsecondlife
         [Flags]
         public enum PermissionType
         {
+            /// <summary></summary>
             Copy = 0x00008000,
+            /// <summary></summary>
             Modify = 0x00004000,
+            /// <summary></summary>
             Move = 0x00080000,
+            /// <summary></summary>
             Transfer = 0x00002000
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
         public enum AttachmentPoint
         {
+            /// <summary></summary>
             Chest = 1,
+            /// <summary></summary>
             Skull,
+            /// <summary></summary>
             LeftShoulder,
+            /// <summary></summary>
             RightShoulder,
+            /// <summary></summary>
             LeftHand,
+            /// <summary></summary>
             RightHand,
+            /// <summary></summary>
             LeftFoot,
+            /// <summary></summary>
             RightFoot,
+            /// <summary></summary>
             Spine,
+            /// <summary></summary>
             Pelvis,
+            /// <summary></summary>
             Mouth,
+            /// <summary></summary>
             Chin,
+            /// <summary></summary>
             LeftEar,
+            /// <summary></summary>
             RightEar,
+            /// <summary></summary>
             LeftEyeball,
+            /// <summary></summary>
             RightEyeball,
+            /// <summary></summary>
             Nose,
+            /// <summary></summary>
             RightUpperArm,
+            /// <summary></summary>
             RightForarm,
+            /// <summary></summary>
             LeftUpperArm,
+            /// <summary></summary>
             LeftForearm,
+            /// <summary></summary>
             RightHip,
+            /// <summary></summary>
             RightUpperLeg,
+            /// <summary></summary>
             RightLowerLeg,
+            /// <summary></summary>
             LeftHip,
+            /// <summary></summary>
             LeftUpperLeg,
+            /// <summary></summary>
             LeftLowerLeg,
+            /// <summary></summary>
             Stomach,
+            /// <summary></summary>
             LeftPec,
+            /// <summary></summary>
             RightPec
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public enum Tree
+        {
+            /// <summary></summary>
+            Pine1 = 0,
+            /// <summary></summary>
+            Oak,
+            /// <summary></summary>
+            TropicalBush1,
+            /// <summary></summary>
+            Palm1,
+            /// <summary></summary>
+            Dogwood,
+            /// <summary></summary>
+            TropicalBush2,
+            /// <summary></summary>
+            Palm2,
+            /// <summary></summary>
+            Cypress1,
+            /// <summary></summary>
+            Cypress2,
+            /// <summary></summary>
+            Pine2,
+            /// <summary></summary>
+            Plumeria,
+            /// <summary></summary>
+            WinterPine1,
+            /// <summary></summary>
+            WinterAspen,
+            /// <summary></summary>
+            WinterPine2,
+            /// <summary></summary>
+            Eucalyptus,
+            /// <summary></summary>
+            Fern,
+            /// <summary></summary>
+            Eelgrass,
+            /// <summary></summary>
+            SeaSword,
+            /// <summary></summary>
+            Kelp1,
+            /// <summary></summary>
+            BeachGrass1,
+            /// <summary></summary>
+            Kelp2
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public enum Grass
+        {
+            /// <summary></summary>
+            Grass0 = 0,
+            /// <summary></summary>
+            Grass1,
+            /// <summary></summary>
+            Grass2,
+            /// <summary></summary>
+            Grass3,
+            /// <summary></summary>
+            Grass4,
+            /// <summary></summary>
+            undergrowth_1
+        }
+
         /// <summary>
         /// This event will be raised for every ObjectUpdate block that 
         /// contains a new prim.
@@ -295,16 +403,16 @@ namespace libsecondlife
             Client.Network.SendPacket(request, simulator);
         }
 
-        public void AddPrim(Simulator simulator, PrimObject prim, LLVector3 nearPosition, LLUUID groupID)
+        public void AddPrim(Simulator simulator, PrimObject prim, LLVector3 nearPosition)
         {
             ObjectAddPacket packet = new ObjectAddPacket();
 
             packet.AgentData.AgentID = Client.Network.AgentID;
             packet.AgentData.SessionID = Client.Network.SessionID;
-            packet.AgentData.GroupID = groupID;
+            packet.AgentData.GroupID = prim.GroupID;
 
-            packet.ObjectData.State = 0;
-            packet.ObjectData.AddFlags = 2;
+            packet.ObjectData.State = (byte)prim.State;
+            packet.ObjectData.AddFlags = 2; // TODO: Why 2?
             packet.ObjectData.PCode = (byte)PCode.Prim;
 
             packet.ObjectData.Material = (byte)prim.Material;
@@ -342,6 +450,52 @@ namespace libsecondlife
             Client.Network.SendPacket(packet, simulator);
         }
 
+        public void AddTree(Simulator simulator, LLVector3 scale, LLQuaternion rotation, LLVector3 position, 
+            Tree treeType, LLUUID groupOwner, bool newTree)
+        {
+            ObjectAddPacket add = new ObjectAddPacket();
+
+            add.AgentData.AgentID = Client.Network.AgentID;
+            add.AgentData.SessionID = Client.Network.SessionID;
+            add.AgentData.GroupID = groupOwner;
+            add.ObjectData.BypassRaycast = 1;
+            add.ObjectData.Material = 3;
+            add.ObjectData.PathCurve = 16;
+            add.ObjectData.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree;
+            add.ObjectData.RayEnd = position;
+            add.ObjectData.RayStart = position;
+            add.ObjectData.RayTargetID = LLUUID.Zero;
+            add.ObjectData.Rotation = rotation;
+            add.ObjectData.Scale = scale;
+            add.ObjectData.State = (byte)treeType;
+            add.ObjectData.TextureEntry = new byte[0];
+
+            Client.Network.SendPacket(add, simulator);
+        }
+
+        public void AddGrass(Simulator simulator, LLVector3 scale, LLQuaternion rotation, LLVector3 position,
+            Grass grassType, LLUUID groupOwner)
+        {
+            ObjectAddPacket add = new ObjectAddPacket();
+
+            add.AgentData.AgentID = Client.Network.AgentID;
+            add.AgentData.SessionID = Client.Network.SessionID;
+            add.AgentData.GroupID = groupOwner;
+            add.ObjectData.BypassRaycast = 1;
+            add.ObjectData.Material = 3;
+            add.ObjectData.PathCurve = 16;
+            add.ObjectData.PCode = (byte)PCode.Grass;
+            add.ObjectData.RayEnd = position;
+            add.ObjectData.RayStart = position;
+            add.ObjectData.RayTargetID = LLUUID.Zero;
+            add.ObjectData.Rotation = rotation;
+            add.ObjectData.Scale = scale;
+            add.ObjectData.State = (byte)grassType;
+            add.ObjectData.TextureEntry = new byte[0];
+
+            Client.Network.SendPacket(add, simulator);
+        }
+
         public void LinkPrims(Simulator simulator, List<uint> localIDs)
         {
             ObjectLinkPacket packet = new ObjectLinkPacket();
diff --git a/libsecondlife-cs/ParticleSystem.cs b/libsecondlife-cs/ParticleSystem.cs
index a2449d85..d2485aa8 100644
--- a/libsecondlife-cs/ParticleSystem.cs
+++ b/libsecondlife-cs/ParticleSystem.cs
@@ -12,13 +12,13 @@ namespace libsecondlife
         public uint PartStartRGBA;
         public uint PartEndRGBA;
 
-        public LLVector3 PartStartScale;
-        public LLVector3 PartEndScale;
+        public LLVector3 PartStartScale = LLVector3.Zero;
+        public LLVector3 PartEndScale = LLVector3.Zero;
 
         public float PartMaxAge;
         public float SrcMaxAge;
 
-        public LLVector3 SrcAccel;
+        public LLVector3 SrcAccel = LLVector3.Zero;
 
         public float SrcAngleBegin;
         public float SrcAngleEnd;
@@ -29,10 +29,10 @@ namespace libsecondlife
         public float SrcBurstSpeedMin;
         public float SrcBurstSpeedMax;
 
-        public LLVector3 SrcOmega;
+        public LLVector3 SrcOmega = LLVector3.Zero;
 
-        public LLUUID SrcTargetKey;
-        public LLUUID SrcTexture;
+        public LLUUID SrcTargetKey = LLUUID.Zero;
+        public LLUUID SrcTexture = LLUUID.Zero;
 
         public SourcePattern SrcPattern;
         public ParticleFlags PartFlags;
@@ -68,6 +68,13 @@ namespace libsecondlife
             Emissive = 0x100
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public ParticleSystem()
+        {
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/libsecondlife-cs/Prims.cs b/libsecondlife-cs/Prims.cs
index 76d071f6..b2146768 100644
--- a/libsecondlife-cs/Prims.cs
+++ b/libsecondlife-cs/Prims.cs
@@ -117,6 +117,9 @@ namespace libsecondlife
         {
             Client = client;
             PCode = ObjectManager.PCode.Prim;
+            Flexible = new PrimFlexibleData();
+            Light = new PrimLightData();
+            ParticleSys = new ParticleSystem();
             Textures = new TextureEntry();
         }
 		
@@ -454,7 +457,14 @@ namespace libsecondlife
         /// <summary></summary>
         public float Tension;
         /// <summary></summary>
-        public LLVector3 Force;
+        public LLVector3 Force = LLVector3.Zero;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public PrimFlexibleData()
+        {
+        }
 
         /// <summary>
         /// 
@@ -516,6 +526,13 @@ namespace libsecondlife
         /// <summary></summary>
         public float Falloff;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public PrimLightData()
+        {
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/libsecondlife-cs/Textures.cs b/libsecondlife-cs/Textures.cs
index 4f2f756c..dc260312 100644
--- a/libsecondlife-cs/Textures.cs
+++ b/libsecondlife-cs/Textures.cs
@@ -90,9 +90,17 @@ namespace libsecondlife
         /// 
         /// </summary>
         public TextureEntry()
+        {
+            FaceTextures = new Dictionary<uint, TextureEntryFace>();
+            //DefaultTexture = new TextureEntryFace(null);
+            DefaultTexture = null;
+        }
+
+        public TextureEntry(LLUUID textureID)
         {
             FaceTextures = new Dictionary<uint, TextureEntryFace>();
             DefaultTexture = new TextureEntryFace(null);
+            DefaultTexture.TextureID = textureID;
         }
 
         /// <summary>
@@ -132,6 +140,11 @@ namespace libsecondlife
         /// <returns></returns>
         public byte[] ToBytes()
         {
+            if (DefaultTexture == null)
+            {
+                return new byte[0];
+            }
+
             MemoryStream memStream = new MemoryStream();
             BinaryWriter binWriter = new BinaryWriter(memStream);