diff --git a/trunk/mainwindow.ui b/trunk/mainwindow.ui
index efab884..3732138 100644
--- a/trunk/mainwindow.ui
+++ b/trunk/mainwindow.ui
@@ -1,130 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>508</width>
     <height>317</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="baseSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <property name="windowIcon">
    <iconset resource="fred.qrc">
     <normaloff>:/icons/resources/fred.png</normaloff>:/icons/resources/fred.png</iconset>
   </property>
   <widget class="QWidget" name="MainWidget"/>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>508</width>
-     <height>25</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="MenuFile">
     <property name="title">
      <string>&amp;File</string>
     </property>
     <addaction name="action_Open_hive"/>
     <addaction name="action_Close_hive"/>
     <addaction name="separator"/>
     <addaction name="action_Quit"/>
    </widget>
    <widget class="QMenu" name="MenuHelp">
     <property name="title">
      <string>&amp;Help</string>
     </property>
     <addaction name="actionAbout_Qt"/>
     <addaction name="actionAbout_fred"/>
    </widget>
    <widget class="QMenu" name="MenuReports">
     <property name="enabled">
      <bool>false</bool>
     </property>
     <property name="title">
      <string>&amp;Reports</string>
     </property>
    </widget>
    <widget class="QMenu" name="MenuEdit">
     <property name="title">
      <string>&amp;Edit</string>
     </property>
     <addaction name="ActionSearch"/>
     <addaction name="separator"/>
     <addaction name="ActionPreferences"/>
    </widget>
    <addaction name="MenuFile"/>
    <addaction name="MenuEdit"/>
    <addaction name="MenuReports"/>
    <addaction name="MenuHelp"/>
   </widget>
   <widget class="QStatusBar" name="StatusBar"/>
   <action name="action_Open_hive">
    <property name="text">
     <string>&amp;Open hive</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
   </action>
   <action name="action_Close_hive">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>&amp;Close hive</string>
+    <string>Close hive</string>
    </property>
   </action>
   <action name="action_Quit">
    <property name="text">
     <string>&amp;Quit</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
   </action>
   <action name="actionAbout_Qt">
    <property name="text">
     <string>About Qt</string>
    </property>
   </action>
   <action name="actionAbout_fred">
    <property name="text">
     <string>About fred</string>
    </property>
   </action>
   <action name="ActionSearch">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="text">
     <string>&amp;Search</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
   </action>
   <action name="ActionPreferences">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="text">
     <string>&amp;Preferences</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
   <include location="fred.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/trunk/report_templates/SYSTEM_CurrentNetworkSettings.qs b/trunk/report_templates/SYSTEM_CurrentNetworkSettings.qs
index d646494..1edcdcb 100644
--- a/trunk/report_templates/SYSTEM_CurrentNetworkSettings.qs
+++ b/trunk/report_templates/SYSTEM_CurrentNetworkSettings.qs
@@ -1,109 +1,130 @@
+// See Appendix A: TCP/IP Configuration Parameters:
+// http://technet.microsoft.com/de-de/library/cc739819%28v=WS.10%29.aspx
+
 function IsValid(val) {
   if(typeof val !== 'undefined') return true;
   else return false;
 }
 
 function print_table_row(cell01,cell02) {
   println("      <tr><td>",cell01,"</td><td>",cell02,"</td></tr>");
 }
 
 function ZeroPad(number,padlen) {
   var ret=number.toString(10);
   if(!padlen || ret.length>=padlen) return ret;
   return Math.pow(10,padlen-ret.length).toString().slice(1)+ret;
 }
 
 // Global vars
 var val;
 
 println("<html>");
 println("  <head><title>Current Network Settings (Tcp/Ip)</title></head>");
 println("  <body style=\"font-size:12\">");
 println("  <h2>Current network settings (Tcp/Ip)</h2>");
 
 // Get current controlset
 var cur_controlset=GetRegistryKeyValue("\\Select","Current");
 if(IsValid(cur_controlset)) {
   cur_controlset=RegistryKeyValueToString(cur_controlset.value,cur_controlset.type);
   // Current holds a DWORD value, thus we get a string like 0x00000000, but
   // control sets are referenced by its decimal representation.
   cur_controlset="ControlSet"+ZeroPad(parseInt(String(cur_controlset).substr(2,8),16),3)
 
   println("  <p style=\"font-size:12; white-space:nowrap\">");
   println("    <table style=\"margin-left:20px; font-size:12; white-space:nowrap\">");
   print_table_row("Active control set:",cur_controlset);
 
   // Computer name
   val=GetRegistryKeyValue(cur_controlset+"\\Control\\ComputerName\\ComputerName","ComputerName");
   print_table_row("Computer name:",(IsValid(val)) ? RegistryKeyValueToString(val.value,val.type) : "");
 
   println("    </table>");
   println("    <br />");
 
   // Iterate over all available network adapters
   var adapters=GetRegistryNodes(cur_controlset+"\\Services\\Tcpip\\Parameters\\Adapters");
   for(var i=0;i<adapters.length;i++) {
-    // TODO: Try to get a human readable name
-    println("    ",adapters[i]);
+    // Try to get a human readable name
+    // According to http://technet.microsoft.com/de-de/library/cc780532%28v=ws.10%29.aspx
+    // the {4D36E972-E325-11CE-BFC1-08002BE10318} key name might be (and hopefully is) static :)
+    val=GetRegistryKeyValue(cur_controlset+"\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"+adapters[i]+"\\Connection","Name");
+    if(IsValid(val)) {
+      println("    ",RegistryKeyValueToString(val.value,val.type));
+    } else {
+      println("    ",adapters[i]);
+    }
+
     // Get settings node
     var adapter_settings_node=GetRegistryKeyValue(cur_controlset+"\\Services\\Tcpip\\Parameters\\Adapters\\"+adapters[i],"IpConfig");
     adapter_settings_node=RegistryKeyValueToVariant(adapter_settings_node.value,"utf16",0);
 
     println("    <table style=\"margin-left:20px; font-size:12; white-space:nowrap\">");
+    //print_table_row("Adapter id:",adapters[i]);
 
     // Get configuration mode
     val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"EnableDHCP");
     val=Number(RegistryKeyValueToString(val.value,val.type));
     if(val) {
       // DHCP enabled
       print_table_row("Configuration mode:","DHCP");
       // DHCP server
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"DhcpServer");
       print_table_row("Last used DHCP server:",(IsValid(val)) ? RegistryKeyValueToString(val.value,val.type) : "");
       // IP address
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"DhcpIPAddress");
       print_table_row("IP address:",(IsValid(val)) ? RegistryKeyValueToString(val.value,val.type) : "");
       // Subnet mask
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"DhcpSubnetMask");
       print_table_row("Subnet mask:",(IsValid(val)) ? RegistryKeyValueToString(val.value,val.type) : "");
       // Nameserver(s)
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"DhcpNameServer");
       print_table_row("Nameserver(s):",(IsValid(val)) ? RegistryKeyValueToString(val.value,val.type) : "");
+      // Domain
+      val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"DhcpDomain");
+      print_table_row("Domain:",(IsValid(val)) ? RegistryKeyValueToString(val.value,val.type) : "");
       // Default gw
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"DhcpDefaultGateway");
       print_table_row("Default gateway:",(IsValid(val)) ? RegistryKeyValueToVariant(val.value,"utf16",0) : "");
       // Lease obtained
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"LeaseObtainedTime");
       print_table_row("Lease obtained:",(IsValid(val)) ? RegistryKeyValueToVariant(val.value,"unixtime",0) : "");
       // Lease valid until
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"LeaseTerminatesTime");
       print_table_row("Lease terminates:",(IsValid(val)) ? RegistryKeyValueToVariant(val.value,"unixtime",0) : "");
     } else {
       print_table_row("Configuration mode:","Manual");
       // IP address
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"IPAddress");
       print_table_row("IP address:",(IsValid(val)) ? RegistryKeyValueToVariant(val.value,"utf16",0) : "");
       // Subnet mask
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"SubnetMask");
       print_table_row("Subnet mask:",(IsValid(val)) ? RegistryKeyValueToVariant(val.value,"utf16",0) : "");
       // Nameserver
-      // TODO: Has to be validated
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"NameServer");
       print_table_row("Nameserver:",(IsValid(val)) ? RegistryKeyValueToVariant(val.value,"utf16",0) : "");
+      // Domain
+      val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"Domain");
+      print_table_row("Domain:",(IsValid(val)) ? RegistryKeyValueToString(val.value,val.type) : "");
       // Default gw
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+adapter_settings_node,"DefaultGateway");
       print_table_row("Default gateway:",(IsValid(val)) ? RegistryKeyValueToVariant(val.value,"utf16",0) : "");
     }
 
+    // TODO: Check for EnableSecurityFilters, TCPAllowedPorts and UDPAllowedPorts to get firewall status.
+
     println("    </table>");
     println("    <br />");
+
+    // TODO: Get persistent routes from \ControlSet001\Services\Tcpip\Parameters\PersistentRoutes
   }
   println("  </p>");
 } else {
   println("  <p><font color='red'>");
   println("    Unable to determine current control set!<br />");
   println("    Are you sure you are running this report against the correct registry hive?");
   println("  </font></p>");
 }
 
 println("</html>");
diff --git a/trunk/report_templates/SYSTEM_Services.qs b/trunk/report_templates/SYSTEM_Services.qs
index a3cbc25..8be6d94 100644
--- a/trunk/report_templates/SYSTEM_Services.qs
+++ b/trunk/report_templates/SYSTEM_Services.qs
@@ -1,94 +1,99 @@
 function IsValid(val) {
   if(typeof val !== 'undefined') return true;
   else return false;
 }
 
 function ZeroPad(number,padlen) {
   var ret=number.toString(10);
   if(!padlen || ret.length>=padlen) return ret;
   return Math.pow(10,padlen-ret.length).toString().slice(1)+ret;
 }
 
-function PrintTableRow(cell01,cell02,cell03) {
-  println("      <tr><td style=\"padding:2px\">",cell01,"</td><td style=\"padding:2px\">",cell02,"</td><td style=\"padding:2px\">",cell03,"</td></tr>");
+function PrintTableRow(cell01,cell02,cell03,cell04,cell05) {
+  println("      <tr><td style=\"padding:2px\">",cell01,"</td><td style=\"padding:2px\">",cell02,"</td><td style=\"padding:2px\">",cell03,"</td><td style=\"padding:2px\">",cell04,"</td><td style=\"padding:2px\">",cell05,"</td></tr>");
 }
 
 function ListService(service_node) {
   // Service name
   var name=GetRegistryKeyValue(service_node,"DisplayName");
   name=(IsValid(name)) ? RegistryKeyValueToString(name.value,name.type) : "Unknwon";
+  // Service group
+  var group=GetRegistryKeyValue(service_node,"Group");
+  group=(IsValid(group)) ? RegistryKeyValueToString(group.value,group.type) : "";
   // Service exe
   var image=GetRegistryKeyValue(service_node,"ImagePath");
   image=(IsValid(image)) ? RegistryKeyValueToString(image.value,image.type) : "Unknwon";
   // Start
   var start=GetRegistryKeyValue(service_node,"Start");
   start=(IsValid(start)) ? RegistryKeyValueToString(start.value,start.type) : -1;
   switch(Number(start)) {
     case 0:
       start="Boot";
       break;
     case 1:
       start="System";
       break;
     case 2:
       start="Automatic";
       break;
     case 3:
       start="Manual";
       break;
     case 4:
       start="Disabled";
       break;
     default:
       start="Unknown";
   }
-  // Description??
+  // Description
+  var desc=GetRegistryKeyValue(service_node,"Description");
+  desc=(IsValid(desc)) ? RegistryKeyValueToString(desc.value,desc.type) : "";
   
-  PrintTableRow(name,start,image)
+  PrintTableRow(name,group,start,image,desc)
 }
 
 // Global vars
 var val;
 
 println("<html>");
 println("  <head><title>Services</title></head>");
 println("  <body style=\"font-size:12\">");
 println("  <h2>Services</h2>");
 
 // Get current controlset
 var cur_controlset=GetRegistryKeyValue("\\Select","Current");
 if(IsValid(cur_controlset)) {
   cur_controlset=RegistryKeyValueToString(cur_controlset.value,cur_controlset.type);
   // Current holds a DWORD value, thus we get a string like 0x00000000, but
   // control sets are referenced by its decimal representation.
   cur_controlset="ControlSet"+ZeroPad(parseInt(String(cur_controlset).substr(2,8),16),3)
 
   // Get list of possible services
   var services=GetRegistryNodes(cur_controlset+"\\Services");
   if(IsValid(services)) {
     println("  <p style=\"font-size:12; white-space:nowrap\">");
     println("    <table style=\"margin-left:20px; font-size:12; white-space:nowrap\">");
-    println("      <tr><td style=\"padding:2px\"><b>Name</b></td style=\"padding:2px\"><td><b>Startup</b></td><td style=\"padding:2px\"><b>Image path</b></td></tr>");
+    println("      <tr><td style=\"padding:2px\"><b>Name</b></td><td style=\"padding:2px\"><b>Group</b></td><td><b>Startup</b></td><td style=\"padding:2px\"><b>Image path</b></td><td style=\"padding:2px\"><b>Description</b></td></tr>");
     for(var i=0;i<services.length;i++) {
       // Get service type
       val=GetRegistryKeyValue(cur_controlset+"\\Services\\"+services[i],"Type");
       if(!IsValid(val)) continue;
       val=RegistryKeyValueToString(val.value,val.type);
       if(Number(val)!=16 && Number(val)!=32) continue;
       ListService(cur_controlset+"\\Services\\"+services[i]);
     }
     println("    </table>");
     println("  </p>");
   } else {
     println("  <p><font color='red'>");
     println("    This registry hive does not contain any services!<br />");
     println("  </font></p>");
   }
 } else {
   println("  <p><font color='red'>");
   println("    Unable to determine current control set!<br />");
   println("    Are you sure you are running this report against the correct registry hive?");
   println("  </font></p>");
 }
 
 println("</html>");