diff --git a/libsecondlife-cs/ParticleSystem.cs b/libsecondlife-cs/ParticleSystem.cs
index 83e84afa..3cb67f13 100644
--- a/libsecondlife-cs/ParticleSystem.cs
+++ b/libsecondlife-cs/ParticleSystem.cs
@@ -123,20 +123,6 @@ namespace libsecondlife
             return bytes;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public string GetXml(string name)
-        {
-            string xml = "<ParticleSystem>";
-            // FIXME: Finish ParticleSystem.GetXml()
-            xml += "</ParticleSystem>";
-
-            return xml;
-        }
-
         /// <summary>
         /// 
         /// </summary>
diff --git a/libsecondlife-cs/Prims.cs b/libsecondlife-cs/Prims.cs
index e9201ec8..65f55b95 100644
--- a/libsecondlife-cs/Prims.cs
+++ b/libsecondlife-cs/Prims.cs
@@ -29,6 +29,43 @@ using System.Xml;
 
 namespace libsecondlife
 {
+    /// <summary>
+    /// Primary parameters for primitives such as Physics Enabled or Phantom
+    /// </summary>
+    [Flags]
+    public enum ObjectFlags
+    {
+        /// <summary>None of the primary flags are enabled</summary>
+        None = 0,
+        /// <summary>Whether physics are enabled for this object</summary>
+        Physics = 1 << 0,
+        /// <summary></summary>
+        CreateSelected = 1 << 1,
+        /// <summary></summary>
+        Script = 1 << 6,
+        /// <summary>Whether this object contains an active touch script</summary>
+        Touch = 1 << 7,
+        /// <summary>Whether this object can receive payments</summary>
+        Money = 1 << 9,
+        /// <summary>Whether this object is phantom (no collisions)</summary>
+        Phantom = 1 << 10,
+        /// <summary>Whether this object is temporary</summary>
+        Temp = 1 << 30
+    }
+
+    /// <summary>
+    /// Extra parameters for primitives, these flags are for features that have
+    /// been added after the original ObjectFlags that has all eight bits 
+    /// reserved already
+    /// </summary>
+    public enum ExtraParamType : ushort
+    {
+        /// <summary>Whether this object has flexible parameters</summary>
+        Flexible = 0x10,
+        /// <summary>Whether this object has light parameters</summary>
+        Light = 0x20
+    }
+
     /// <summary>
     /// 
     /// </summary>
@@ -409,73 +446,6 @@ namespace libsecondlife
             return totalLength;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public string GetXml()
-        {
-            string xml = "<Prim>";
-            xml += "<PathTwistBegin value=\"" + PathTwistBegin + "\" />";
-            xml += "<PathEnd value=\"" + PathEnd + "\" />";
-            xml += "<ProfileBegin value=\"" + ProfileBegin + "\" />";
-            xml += "<PathRadiusOffset value=\"" + PathRadiusOffset + "\" />";
-            xml += "<PathSkew value=\"" + PathSkew + "\" />";
-            xml += Position.GetXml("Position");
-            xml += "<ProfileCurve value=\"" + ProfileCurve + "\" />";
-            xml += "<PathScaleX value=\"" + PathScaleX + "\" />";
-            xml += "<PathScaleY value=\"" + PathScaleY + "\" />";
-            xml += "<ID value=\"" + ID.ToString() + "\" />";
-            xml += "<LocalID value=\"" + LocalID + "\" />";
-            xml += "<ParentID value=\"" + ParentID + "\" />";
-            xml += "<GroupID value=\"" + GroupID.ToString() + "\" />";
-            xml += "<Material value=\"" + Material + "\" />";
-            xml += "<Name value=\"" + Name + "\" />";
-            xml += "<Description value=\"" + Description + "\" />";
-            xml += "<PathShearX value=\"" + PathShearX + "\" />";
-            xml += "<PathShearY value=\"" + PathShearY + "\" />";
-            xml += "<PathTaperX value=\"" + PathTaperX + "\" />";
-            xml += "<PathTaperY value=\"" + PathTaperY + "\" />";
-            xml += "<ProfileEnd value=\"" + ProfileEnd + "\" />";
-            xml += "<PathBegin value=\"" + PathBegin + "\" />";
-            xml += "<PathCurve value=\"" + PathCurve + "\" />";
-            xml += Scale.GetXml("Scale");
-            xml += "<PathTwist value=\"" + PathTwist + "\" />";
-            xml += "<ProfileHollow value=\"" + ProfileHollow + "\" />";
-            xml += "<PathRevolutions value=\"" + PathRevolutions + "\" />";
-            xml += Rotation.GetXml("Rotation");
-            xml += "<State value=\"" + State + "\" />";
-            xml += "<Text value=\"" + Text + "\" />";
-            xml += "<PCode value=\"" + PCode + "\" />";
-            xml += "<Flags value=\"" + Flags + "\" />";
-            xml += Textures.GetXml("Textures");
-            xml += TextureAnim.GetXml("TextureAnim");
-            xml += Flexible.GetXml("Flexible");
-            xml += Light.GetXml("Light");
-            xml += ParticleSys.GetXml("ParticleSys");
-            xml += "</Prim>";
-
-            return xml;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="client"></param>
-        /// <param name="node"></param>
-        /// <returns></returns>
-        public static PrimObject FromXml(SecondLife client, XmlNode node)
-        {
-            PrimObject prim = new PrimObject(client);
-
-            foreach (XmlNode childNode in node.ChildNodes)
-            {
-                ;
-            }
-
-            return prim;
-        }
-
         public override string ToString()
         {
             string output = "";
@@ -495,31 +465,6 @@ namespace libsecondlife
         }
 	}
 
-    /// <summary>
-    /// 
-    /// </summary>
-    [Flags]
-    public enum ObjectFlags
-    {
-        None = 0,
-        Physics = 1 << 0,
-        CreateSelected = 1 << 1,
-        Script = 1 << 6,
-        Touch = 1 << 7,
-        Money = 1 << 9,
-        Phantom = 1 << 10,
-        Temp = 1 << 30
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public enum ExtraParamType : ushort
-    {
-        Flexible = 0x10,
-        Light = 0x20
-    }
-
     /// <summary>
     /// 
     /// </summary>
@@ -589,34 +534,6 @@ namespace libsecondlife
             Wind = data[i++] / 10.0f;
             Force = new LLVector3(data, i);
         }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public string GetXml(string name)
-        {
-            string xml = "<" + name + ">";
-            xml += "<Softness value=\"" + Softness + "\" />";
-            xml += "<Tension value=\"" + Tension + "\" />";
-            xml += "<Drag value=\"" + Drag + "\" />";
-            xml += "<Gravity value=\"" + Gravity + "\" />";
-            xml += "<Wind value=\"" + Wind + "\" />";
-            xml += "</" + name + ">";
-
-            return xml;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="node"></param>
-        /// <returns></returns>
-        public static PrimFlexibleData FromXml(XmlNode node)
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -676,33 +593,6 @@ namespace libsecondlife
             return data;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public string GetXml(string name)
-        {
-            string xml = "<" + name + ">";
-            xml += "<Color X=\"" + R + "\" Y=\"" + G + "\" Z=\"" + B + "\" />";
-            xml += "<Intensity value=\"" + Intensity + "\" />";
-            xml += "<Radius value=\"" + Radius + "\" />";
-            xml += "<Falloff value=\"" + Falloff + "\" />";
-            xml += "</" + name + ">";
-
-            return xml;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="node"></param>
-        /// <returns></returns>
-        public static PrimLightData FromXml(XmlNode node)
-        {
-            return null;
-        }
-
         private void FromBytes(byte[] data, int pos)
         {
             int i = pos;
diff --git a/libsecondlife-cs/Textures.cs b/libsecondlife-cs/Textures.cs
index 6a363116..1a62f9ee 100644
--- a/libsecondlife-cs/Textures.cs
+++ b/libsecondlife-cs/Textures.cs
@@ -342,20 +342,6 @@ namespace libsecondlife
             return bytes;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public string GetXml(string name)
-        {
-            string xml = "<TextureEntry>";
-            // FIXME: Write GetXml for TextureEntry
-            xml += "</TextureEntry>";
-
-            return xml;
-        }
-
         private bool ReadFaceBitfield(byte[] data, ref int pos, ref uint faceBits, ref uint bitfieldSize)
         {
             faceBits = 0;
@@ -820,26 +806,6 @@ namespace libsecondlife
             return bytes;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public string GetXml(string name)
-        {
-            string xml = "<TextureAnimation>";
-            xml += "<Flags value=\"" + Flags + "\" />";
-            xml += "<Face value=\"" + Face + "\" />";
-            xml += "<SizeX value=\"" + SizeX + "\" />";
-            xml += "<SizeY value=\"" + SizeY + "\" />";
-            xml += "<Start value=\"" + Start + "\" />";
-            xml += "<Length value=\"" + Length + "\" />";
-            xml += "<Rate value=\"" + Rate + "\" />";
-            xml += "</TextureAnimation>";
-
-            return xml;
-        }
-
         private void FromBytes(byte[] data, int pos)
         {
             int i = pos;
diff --git a/libsecondlife-cs/Types.cs b/libsecondlife-cs/Types.cs
index 3f8f6f84..8b6de1b2 100644
--- a/libsecondlife-cs/Types.cs
+++ b/libsecondlife-cs/Types.cs
@@ -346,16 +346,6 @@ namespace libsecondlife
 			return byteArray;
 		}
 
-        /// <summary>
-        /// Convert to a single xml node
-        /// </summary>
-        /// <param name="name">The desired name of the xml node</param>
-        /// <returns>A line of xml data containing the values for this data type</returns>
-        public string GetXml(string name)
-        {
-            return "<" + name + " x=\"" + X + "\" y=\"" + Y + "\" z=\"" + Z + "\" />";
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -756,16 +746,6 @@ namespace libsecondlife
 			return bytes;
 		}
 
-        /// <summary>
-        /// Convert to a single xml node
-        /// </summary>
-        /// <param name="name">The desired name of the xml node</param>
-        /// <returns>A line of xml data containing the values for this data type</returns>
-        public string GetXml(string name)
-        {
-            return "<" + name + " x=\"" + X + "\" y=\"" + Y + "\" z=\"" + Z + "\" w=\"" + W + "\" />";
-        }
-
         public override int GetHashCode()
         {
             float sum = X + Y + Z + W;
diff --git a/libsecondlife-cs/examples/TestClient/Commands/FollowCommand.cs b/libsecondlife-cs/examples/TestClient/Commands/FollowCommand.cs
index eae2a9fa..e7c3185e 100644
--- a/libsecondlife-cs/examples/TestClient/Commands/FollowCommand.cs
+++ b/libsecondlife-cs/examples/TestClient/Commands/FollowCommand.cs
@@ -17,17 +17,24 @@ namespace libsecondlife.TestClient
         public override string Execute(SecondLife Client, string[] args, LLUUID fromAgentID)
 		{
 			string target = String.Empty;
-			for (int ct = 0; ct < args.Length;ct++)
+			for (int ct = 0; ct < args.Length; ct++)
 				target = target + args[ct] + " ";
 			target = target.TrimEnd();
 
 			if (target.Length == 0)
 				target = TestClient.Master;
-			
-			if (Follow(target))
-				return "Following " + target;
-			else
-				return "Unable to follow " + target + ".  Client may not be able to see that avatar.";
+
+            if (target.Length > 0)
+            {
+                if (Follow(target))
+                    return "Following " + target;
+                else
+                    return "Unable to follow " + target + ".  Client may not be able to see that avatar.";
+            }
+            else
+            {
+                return "No target specified and no master is set. usage: follow [FirstName LastName])";
+            }
 		}
 
         const float DISTANCE_BUFFER = 3.0f;
diff --git a/libsecondlife-cs/examples/TestClient/Commands/SitCommand.cs b/libsecondlife-cs/examples/TestClient/Commands/SitCommand.cs
index 06a76a16..366baafc 100644
--- a/libsecondlife-cs/examples/TestClient/Commands/SitCommand.cs
+++ b/libsecondlife-cs/examples/TestClient/Commands/SitCommand.cs
@@ -22,7 +22,7 @@ namespace libsecondlife.TestClient
 		    sitPacket.AgentData.SessionID = Client.Network.SessionID;
 
 		    sitPacket.TargetObject.TargetID = target;
-		    sitPacket.TargetObject.Offset = new LLVector3();
+		    sitPacket.TargetObject.Offset = LLVector3.Zero;
 
 		    Client.Network.SendPacket(sitPacket);
 
diff --git a/libsecondlife-cs/examples/primexport/frmPrimExport.cs b/libsecondlife-cs/examples/primexport/frmPrimExport.cs
index 9cba3372..4a1cc851 100644
--- a/libsecondlife-cs/examples/primexport/frmPrimExport.cs
+++ b/libsecondlife-cs/examples/primexport/frmPrimExport.cs
@@ -544,7 +544,8 @@ namespace primexport
                         // This prim is part of a linkset, we need to adjust it's position and rotation
                         if (Prims.ContainsKey(prim.ParentID))
                         {
-                            stream.WriteLine(prim.GetXml());
+                            // FIXME: Rewrite this when the xml serialization stuff is complete
+                            //stream.WriteLine(prim.GetXml());
                         }
                         else if (Avatars.Contains(prim.ParentID) || Attachments.Contains(prim.ParentID))
                         {