diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
index 680bd65c50..3ee49a4172 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
@@ -353,7 +353,6 @@ public class EnumerationData {
         vLibraryUsage.addElement("SOMETIMES_CONSUMED");
         vLibraryUsage.addElement("ALWAYS_PRODUCED");
         vLibraryUsage.addElement("SOMETIMES_PRODUCED");
-        vLibraryUsage.addElement("DEFAULT");
         vLibraryUsage.addElement("PRIVATE");
     }
     
@@ -516,7 +515,6 @@ public class EnumerationData {
         vPackageUsage.removeAllElements();
         vPackageUsage.addElement("ALWAYS_CONSUMED");
         vPackageUsage.addElement("ALWAYS_PRODUCED");
-        vPackageUsage.addElement("DEFAULT");
     }
     
     private void initProtocolUsage() {
@@ -618,7 +616,6 @@ public class EnumerationData {
         vBootModeNames.addElement("MINIMAL");
         vBootModeNames.addElement("NO_CHANGE");
         vBootModeNames.addElement("DIAGNOSTICS");
-        vBootModeNames.addElement("DEFAULT");
         vBootModeNames.addElement("S2_RESUME");
         vBootModeNames.addElement("S3_RESUME");
         vBootModeNames.addElement("S4_RESUME");
@@ -666,7 +663,6 @@ public class EnumerationData {
         vGuidUsage.addElement("SOMETIMES_CONSUMED");
         vGuidUsage.addElement("ALWAYS_PRODUCED");
         vGuidUsage.addElement("SOMETIMES_PRODUCED");
-        vGuidUsage.addElement("DEFAULT");
         vGuidUsage.addElement("PRIVATE");
     }
     
@@ -678,24 +674,6 @@ public class EnumerationData {
         vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER);
         vExternTypes.addElement(EnumerationData.EXTERNS_LIBRARY);
         vExternTypes.addElement(EnumerationData.EXTERNS_CALL_BACK);
-        
-//        vExternTypes.addElement(EnumerationData.EXTERNS_PCD_IS_DRIVER);
-//
-//        vExternTypes.addElement(EnumerationData.EXTERNS_SPECIFICATION);
-//        
-//        vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_ENTRY_POINT);
-//        vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_UNLOAD_IMAGE);
-//        
-//        vExternTypes.addElement(EnumerationData.EXTERNS_CONSTRUCTOR);
-//        vExternTypes.addElement(EnumerationData.EXTERNS_DESTRUCTOR);
-        
-//        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_BINDING);
-//        vExternTypes.addElement(EnumerationData.EXTERNS_COMPONENT_NAME);
-//        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_CONFIG);
-//        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_DIAG);
-//        
-//        vExternTypes.addElement(EnumerationData.EXTERNS_SET_VIRTUAL_ADDRESS_MAP_CALL_BACK);
-//        vExternTypes.addElement(EnumerationData.EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK);
     }
     
     private void initPcdDriverTypes() {
@@ -719,7 +697,6 @@ public class EnumerationData {
         vPcdUsage.addElement("SOMETIMES_CONSUMED");
         vPcdUsage.addElement("ALWAYS_PRODUCED");
         vPcdUsage.addElement("SOMETIMES_PRODUCED");
-        vPcdUsage.addElement("DEFAULT");
     }
     
     public Vector<String> getvCompontentType() {
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
index 0de6aa78f0..0607658bca 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
@@ -68,11 +68,9 @@ public class Log {
         try {
             //Log.log("Test", "test");
             //Log.err("Test1", "test1");
-            Log.wrn("1");
             Log
-               .wrn(
-                    "aaa bbbbbb cccccccccccc ddddddddddd eeeeeeeeee fffffffffff gggggggggggggggggg hhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
-                    "iiiiii jjjj kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk lll mmm nn poooooooooooooooooooooooooooooooooooooooooooop");
+               .wrn("aaa bbbbbb cccccccccccc ddddddddddd eeeeeeeeee fffffffffff gggggggggggggggggg hhhhhhhhhhhhhhhhhhhhhhhhhhhhh iiiii jjjj kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk lll mmm nn poooooooooooooooooooooooooooooooooooooooooooop");
+            Log.wrn("Incorrect data type for ModuleEntryPoint");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -176,7 +174,8 @@ public class Log {
      **/
     private static void showWrnMessage(String strErr) {
         String strReturn = Tools.wrapStringByWord(strErr);
-        JOptionPane.showConfirmDialog(null, strReturn, "Warning", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
+        JOptionPane
+                   .showConfirmDialog(null, strReturn, "Warning", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
     }
 
     /**
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
index e6647d24cc..33dc521eda 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
@@ -354,7 +354,7 @@ public class Tools {
                 // Finish previous line
                 //
                 if (!isCopied) {
-                    strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR;
+                    strReturn = strReturn + strTemp + DataType.LINE_SEPARATOR;
                     strTemp = "";
                 }
                 //
@@ -376,8 +376,12 @@ public class Tools {
                     strTemp = strTemp + " " + ss;
                     continue;
                 } else {
-                    strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR;
-                    strTemp = ss + " ";
+                    strReturn = strReturn + strTemp + DataType.LINE_SEPARATOR;
+                    if ((index == s.length - 1) && (!ss.equals(""))) {
+                        strReturn = strReturn + ss;
+                    } else {
+                        strTemp = ss + " ";
+                    }
                     isCopied = true;
                 }
             }
@@ -632,7 +636,7 @@ public class Tools {
         count = wholeString.split(searchString).length;
         return count;
     }
-    
+
     /**
      * Check the input data is empty or not
      * 
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
index 70e2166fbe..fddf763e7f 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
@@ -640,6 +640,7 @@ public class MsaHeader extends IInternalFrame {
             jComboBoxPcdIsDriver.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxPcdIsDriver.setBounds(new java.awt.Rectangle(160, 530, 320, 20));
             jComboBoxPcdIsDriver.addItemListener(this);
+            jComboBoxPcdIsDriver.addFocusListener(this);
             jComboBoxPcdIsDriver.setEnabled(false);
             Tools.generateComboBoxByVector(jComboBoxPcdIsDriver, ed.getVPcdDriverTypes());
         }
@@ -889,7 +890,6 @@ public class MsaHeader extends IInternalFrame {
             jContentPane.add(jLabelLicense, null);
             jContentPane.add(jLabelCopyright, null);
             jContentPane.add(jLabelDescription, null);
-            //            jContentPane.add(jLabelSpecification, null);
             jContentPane.add(getJTextFieldSpecification(), null);
             jContentPane.add(getJButtonOk(), null);
             jContentPane.add(getJButtonCancel(), null);
@@ -929,8 +929,6 @@ public class MsaHeader extends IInternalFrame {
             jStarLabel13.setLocation(new java.awt.Point(0, 480));
             jStarLabel14 = new StarLabel();
             jStarLabel14.setLocation(new java.awt.Point(0, 505));
-            //            jStarLabel15 = new StarLabel();
-            //            jStarLabel15.setLocation(new java.awt.Point(0, 530));
 
             jContentPane.add(jStarLabel1, null);
             jContentPane.add(jStarLabel2, null);
@@ -943,7 +941,6 @@ public class MsaHeader extends IInternalFrame {
             jContentPane.add(jStarLabel12, null);
             jContentPane.add(jStarLabel13, null);
             jContentPane.add(jStarLabel14, null);
-            //            jContentPane.add(jStarLabel15, null);
             jContentPane.add(getJScrollPaneCopyright(), null);
 
             jContentPane.add(getJCheckBoxIa32(), null);
@@ -1411,21 +1408,17 @@ public class MsaHeader extends IInternalFrame {
         //
         // Check Pcd is Driver
         //
-        if (arg0.getSource() == this.jCheckBoxPcd) {
+        if (arg0.getSource() == this.jCheckBoxPcd || arg0.getSource() == this.jComboBoxPcdIsDriver) {
             if ((this.ex == null) && this.jCheckBoxPcd.isSelected()) {
                 this.ex = ExternsDocument.Externs.Factory.newInstance();
                 this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem()
                                                                                               .toString()));
                 this.msa.setExterns(this.ex);
-            }
-
-            if ((this.ex != null) && (this.ex.getPcdIsDriver() == null) && this.jCheckBoxPcd.isSelected()) {
+            } else if ((this.ex != null) && (this.ex.getPcdIsDriver() == null) && this.jCheckBoxPcd.isSelected()) {
                 this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem()
                                                                                               .toString()));
                 this.msa.setExterns(this.ex);
-            }
-
-            if ((this.ex != null) && (this.ex.getPcdIsDriver() != null)) {
+            } else if ((this.ex != null) && (this.ex.getPcdIsDriver() != null)) {
                 if (this.jCheckBoxPcd.isSelected()
                     && !this.jComboBoxPcdIsDriver.getSelectedItem().toString().equals(
                                                                                       this.ex.getPcdIsDriver()
@@ -1465,14 +1458,10 @@ public class MsaHeader extends IInternalFrame {
                 this.ex = ExternsDocument.Externs.Factory.newInstance();
                 this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected());
                 this.msa.setExterns(this.ex);
-            }
-
-            if ((this.ex != null) && this.jCheckBoxFlashMap.isSelected()) {
+            } else if ((this.ex != null) && this.jCheckBoxFlashMap.isSelected()) {
                 this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected());
                 this.msa.setExterns(this.ex);
-            }
-
-            if ((this.ex != null) && !this.jCheckBoxFlashMap.isSelected()) {
+            } else if ((this.ex != null) && !this.jCheckBoxFlashMap.isSelected()) {
                 ExternsDocument.Externs newEx = ExternsDocument.Externs.Factory.newInstance();
                 if (this.ex.getExternList() != null) {
                     for (int index = 0; index < this.ex.getExternList().size(); index++) {