diff --git a/libsecondlife/AppearanceManager.cs b/libsecondlife/AppearanceManager.cs
index 64361745..b4e623e5 100644
--- a/libsecondlife/AppearanceManager.cs
+++ b/libsecondlife/AppearanceManager.cs
@@ -95,9 +95,7 @@ namespace libsecondlife
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="wearables">A mapping of WearableTypes to KeyValuePairs
-        /// with Asset ID of the wearable as key and Item ID as value</param>
-        public delegate void AgentWearablesCallback(Dictionary<WearableType, KeyValuePair<LLUUID, LLUUID>> wearables);
+        public delegate void AgentWearablesCallback();
         /// <summary>
         /// 
         /// </summary>
@@ -176,6 +174,8 @@ namespace libsecondlife
         //private bool DownloadWearables = false;
         private static int CacheCheckSerialNum = 1; //FIXME
         private static uint SetAppearanceSerialNum = 1; //FIXME
+        private WearParams _wearOutfitParams;
+        private bool _bake;
         private AutoResetEvent WearablesRequestEvent = new AutoResetEvent(false);
         private AutoResetEvent WearablesDownloadedEvent = new AutoResetEvent(false);
         private AutoResetEvent CachedResponseEvent = new AutoResetEvent(false);
@@ -255,7 +255,6 @@ namespace libsecondlife
             appearanceThread.Start();
         }
 
-        private bool _bake;
         private void StartSetPreviousAppearance()
         {
             SendAgentWearablesRequest();
@@ -360,7 +359,6 @@ namespace libsecondlife
             appearanceThread.Start();
         }
 
-        private WearParams _wearOutfitParams;
         private void StartWearOutfitFolder()
         {
             SendAgentWearablesRequest(); // request current wearables async
@@ -820,12 +818,10 @@ namespace libsecondlife
             set.AgentData.SerialNum = SetAppearanceSerialNum++;
             set.VisualParam = new AgentSetAppearancePacket.VisualParamBlock[VisualParams.Params.Count];
 
-
-
             float AgentSizeVPHeight = 0.0f;
             float AgentSizeVPHeelHeight = 0.0f;
             float AgentSizeVPPlatformHeight = 0.0f;
-            float AgentSizeVPHeadSize = 0.0f;
+            float AgentSizeVPHeadSize = 0.5f;
             float AgentSizeVPLegLength = 0.0f;
             float AgentSizeVPNeckLength = 0.0f;
             float AgentSizeVPHipLength = 0.0f;
@@ -838,7 +834,6 @@ namespace libsecondlife
                 // Build the visual param array
                 foreach (KeyValuePair<int, VisualParam> kvp in VisualParams.Params)
                 {
-                    bool found = false;
                     set.VisualParam[vpIndex] = new AgentSetAppearancePacket.VisualParamBlock();
                     VisualParam vp = kvp.Value;
 
@@ -848,7 +843,6 @@ namespace libsecondlife
                         if (data.Asset != null && data.Asset.Params.ContainsKey(vp.ParamID))
                         {
                             set.VisualParam[vpIndex].ParamValue = Helpers.FloatToByte(data.Asset.Params[vp.ParamID], vp.MinValue, vp.MaxValue);
-                            found = true;
                             count++;
 
                             switch (vp.ParamID)
@@ -879,37 +873,6 @@ namespace libsecondlife
                         }
                     }
 
-                    // Use a default value if we don't have one set for it
-                    if (!found)
-                    {
-                        set.VisualParam[vpIndex].ParamValue = Helpers.FloatToByte(vp.DefaultValue, vp.MinValue, vp.MaxValue);
-
-                        switch (vp.ParamID)
-                        {
-                            case 33:
-                                AgentSizeVPHeight = vp.DefaultValue;
-                                break;
-                            case 198:
-                                AgentSizeVPHeelHeight = vp.DefaultValue;
-                                break;
-                            case 503:
-                                AgentSizeVPPlatformHeight = vp.DefaultValue;
-                                break;
-                            case 682:
-                                AgentSizeVPHeadSize = vp.DefaultValue;
-                                break;
-                            case 692:
-                                AgentSizeVPLegLength = vp.DefaultValue;
-                                break;
-                            case 756:
-                                AgentSizeVPNeckLength = vp.DefaultValue;
-                                break;
-                            case 842:
-                                AgentSizeVPHipLength = vp.DefaultValue;
-                                break;
-                        }
-                    }
-
                     vpIndex++;
                 }
 
@@ -1057,25 +1020,6 @@ namespace libsecondlife
             }
         }
 
-        private void CallOnAgentWearables()
-        {
-            if (OnAgentWearables != null)
-            {
-                // Refactor our internal Wearables dictionary in to something for the callback
-                Dictionary<WearableType, KeyValuePair<LLUUID, LLUUID>> wearables =
-                    new Dictionary<WearableType, KeyValuePair<LLUUID, LLUUID>>();
-
-                lock (Wearables.Dictionary)
-                {
-                    foreach (KeyValuePair<WearableType, WearableData> data in Wearables.Dictionary)
-                        wearables.Add(data.Key, new KeyValuePair<LLUUID, LLUUID>(data.Value.Item.AssetUUID, data.Value.Item.UUID));
-                }
-
-                try { OnAgentWearables(wearables); }
-                catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, Client, e); }
-            }
-        }
-
         private void UploadBake(Baker bake)
         {
             // Upload the completed layer data
@@ -1309,6 +1253,12 @@ namespace libsecondlife
             else
             {
                 // Everything is downloaded
+                if (OnAgentWearables != null)
+                {
+                    try { OnAgentWearables(); }
+                    catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, Client, e); }
+                }
+
                 WearablesDownloadedEvent.Set();
             }
         }
diff --git a/libsecondlife/AssetTypes.cs b/libsecondlife/AssetTypes.cs
index 789e609b..10d119cf 100644
--- a/libsecondlife/AssetTypes.cs
+++ b/libsecondlife/AssetTypes.cs
@@ -327,7 +327,6 @@ namespace libsecondlife
                         fields = line.Split(' ');
                         if (fields[0] == "parameters")
                         {
-
                             int count = Int32.Parse(fields[1]) + stri;
                             for (; stri < count; )
                             {
@@ -337,14 +336,10 @@ namespace libsecondlife
 
                                 int id = Int32.Parse(fields[0]);
                                 if (fields[1] == ",")
-                                {
                                     fields[1] = "0";
-                                }
-
                                 else
-                                {
                                     fields[1] = fields[1].Replace(',', '.');
-                                }
+
                                 float weight = float.Parse(fields[1], System.Globalization.NumberStyles.Float,
                                     Helpers.EnUsCulture.NumberFormat);
 
diff --git a/libsecondlife/Resources/avatar_lad.xml b/libsecondlife/Resources/avatar_lad.xml
index 4ca21572..7062c366 100644
--- a/libsecondlife/Resources/avatar_lad.xml
+++ b/libsecondlife/Resources/avatar_lad.xml
@@ -3152,6 +3152,30 @@
          <param_morph />
       </param>
 
+<!--
+        ##############
+        # Lipsync morphs
+        ##############
+        -->
+
+      <param
+       id="70"
+       group="1"
+       name="Lipsync_Aah"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="71"
+       group="1"
+       name="Lipsync_Ooh"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
 <!--
         ##############
         # other morphs (not user controlled)
diff --git a/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs b/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs
index e3f14793..1afcfb77 100644
--- a/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs
+++ b/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs
@@ -13,9 +13,9 @@ namespace VisualParamGenerator
 
         static void Main(string[] args)
         {
-            if (args.Length < 3)
+            if (args.Length < 2)
             {
-                Console.WriteLine("Usage: VisualParamGenerator.exe [avatar_lad.xml] [template.cs] [_VisualParams_.cs]");
+                Console.WriteLine("Usage: VisualParamGenerator.exe [template.cs] [_VisualParams_.cs]");
                 return;
             }
             else if (!File.Exists(args[0]))
@@ -29,32 +29,44 @@ namespace VisualParamGenerator
 
             try
             {
-                writer = new StreamWriter(args[2]);
+                writer = new StreamWriter(args[1]);
             }
             catch (Exception)
             {
-                Console.WriteLine("Couldn't open " + args[2] + " for writing");
+                Console.WriteLine("Couldn't open " + args[1] + " for writing");
                 return;
             }
 
             try
             {
                 // Read in the template.cs file and write it to our output
-                TextReader reader = new StreamReader(args[1]);
+                TextReader reader = new StreamReader(args[0]);
                 writer.WriteLine(reader.ReadToEnd());
                 reader.Close();
             }
             catch (Exception)
             {
-                Console.WriteLine("Couldn't read from file " + args[1]);
+                Console.WriteLine("Couldn't read from file " + args[0]);
                 return;
             }
 
             try
             {
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(File.ReadAllText(args[0]));
-                list = doc.GetElementsByTagName("param");
+                // Read in avatar_lad.xml
+                Stream stream = libsecondlife.Helpers.GetResourceStream("avatar_lad.xml");
+                StreamReader reader = new StreamReader(stream);
+
+                if (stream != null)
+                {
+                    XmlDocument doc = new XmlDocument();
+                    doc.LoadXml(reader.ReadToEnd());
+                    list = doc.GetElementsByTagName("param");
+                }
+                else
+                {
+                    Console.WriteLine("Failed to load resource avatar_lad.xml. Are you missing a data folder?");
+                    return;
+                }
             }
             catch (Exception e)
             {
@@ -100,17 +112,17 @@ namespace VisualParamGenerator
                         int group = Int32.Parse(node.Attributes["group"].Value);
                         string wearable = node.Attributes["wearable"].Value;
 
-                        string label = String.Empty;
+                        string label = "String.Empty";
                         if (node.Attributes["label"] != null)
-                            label = node.Attributes["label"].Value;
+                            label = "\"" + node.Attributes["label"].Value + "\"";
 
-                        string label_min = String.Empty;
+                        string label_min = "String.Empty";
                         if (node.Attributes["label_min"] != null)
-                            label_min = node.Attributes["label_min"].Value;
+                            label_min = "\"" + node.Attributes["label_min"].Value + "\"";
 
-                        string label_max = String.Empty;
+                        string label_max = "String.Empty";
                         if (node.Attributes["label_max"] != null)
-                            label_max = node.Attributes["label_max"].Value;
+                            label_max = "\"" + node.Attributes["label_max"].Value + "\"";
 
                         float min = Single.Parse(node.Attributes["value_min"].Value, 
                             System.Globalization.NumberStyles.Float, EnUsCulture.NumberFormat);
@@ -125,8 +137,8 @@ namespace VisualParamGenerator
                             def = min;
 
                         IDs.Add(id, "            new VisualParam(" + id + ", \"" + name + "\", " + group + 
-                            ", \"" + wearable + "\", \"" + label + "\", \"" + label_min + "\", \"" + label_max + 
-                            "\", " + def + "f, " + min + "f, " + max + "f)," + Environment.NewLine);
+                            ", \"" + wearable + "\", " + label + ", " + label_min + ", " + label_max + 
+                            ", " + def + "f, " + min + "f, " + max + "f)," + Environment.NewLine);
                     }
                     catch (Exception e)
                     {
diff --git a/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj b/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj
index 8285b718..bea83f7b 100644
--- a/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj
+++ b/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj
@@ -45,6 +45,12 @@
   <ItemGroup>
     <Compile Include="VisualParamGenerator.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libsecondlife.csproj">
+      <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
+      <Name>libsecondlife</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.