diff --git a/lib/SNMP/Info.pm b/lib/SNMP/Info.pm
index 8f55954c..d76608be 100644
--- a/lib/SNMP/Info.pm
+++ b/lib/SNMP/Info.pm
@@ -265,12 +265,6 @@ support.
 
 See documentation in L<SNMP::Info::Bridge> for details.
 
-=item SNMP::Info::CiscoAgg
-
-SNMP Interface to Cisco Aggregated Links
-
-See documentation in L<SNMP::Info::CiscoAgg> for details.
-
 =item SNMP::Info::CDP
 
 F<CISCO-CDP-MIB>.  Cisco Discovery Protocol (CDP) Support.  Inherited by
@@ -278,6 +272,12 @@ Cisco, Enterasys, and HP devices.
 
 See documentation in L<SNMP::Info::CDP> for details.
 
+=item SNMP::Info::CiscoAgg
+
+SNMP Interface to Cisco Aggregated Links
+
+See documentation in L<SNMP::Info::CiscoAgg> for details.
+
 =item SNMP::Info::CiscoConfig
 
 F<CISCO-CONFIG-COPY-MIB>, F<CISCO-FLASH-MIB>, and F<OLD-CISCO-SYS-MIB>.
@@ -317,12 +317,6 @@ F<CISCO-STACK-MIB>.
 
 See documentation in L<SNMP::Info::CiscoStack> for details.
 
-=item SNMP::Info::CiscoStpExtensions
-
-F<CISCO-STP-EXTENSIONS-MIB>
-
-See documentation in L<SNMP::Info::CiscoStpExtensions> for details.
-
 =item SNMP::Info::CiscoStats
 
 F<OLD-CISCO-CPU-MIB>, F<CISCO-PROCESS-MIB>, and F<CISCO-MEMORY-POOL-MIB>.
@@ -331,6 +325,12 @@ devices.
 
 See documentation in L<SNMP::Info::CiscoStats> for details.
 
+=item SNMP::Info::CiscoStpExtensions
+
+F<CISCO-STP-EXTENSIONS-MIB>
+
+See documentation in L<SNMP::Info::CiscoStpExtensions> for details.
+
 =item SNMP::Info::CiscoVTP
 
 F<CISCO-VTP-MIB>, F<CISCO-VLAN-MEMBERSHIP-MIB>,
@@ -338,18 +338,18 @@ F<CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB>
 
 See documentation in L<SNMP::Info::CiscoVTP> for details.
 
-=item SNMP::Info::DocsisHE
-
-SNMP Interface for DOCSIS CMTS
-
-See documentation in L<SNMP::Info::DocsisHE> for details.
-
 =item SNMP::Info::DocsisCM
 
 SNMP Interface for DOCSIS Cable Modems
 
 See documentation in L<SNMP::Info::DocsisCM> for details.
 
+=item SNMP::Info::DocsisHE
+
+SNMP Interface for DOCSIS CMTS
+
+See documentation in L<SNMP::Info::DocsisHE> for details.
+
 =item SNMP::Info::EDP
 
 Extreme Discovery Protocol.  F<EXTREME-EDP-MIB>
@@ -520,18 +520,18 @@ Subclass for Adtran devices.
 
 See documentation in L<SNMP::Info::Layer2::Adtran> for details.
 
-=item SNMP::Info::Layer2::Aerohive
-
-Subclass for Aerohive Access Points.
-
-See documentation in L<SNMP::Info::Layer2::Aerohive> for details.
-
 =item SNMP::Info::Layer2::Airespace
 
 Subclass for Cisco (Airespace) wireless controllers.
 
 See documentation in L<SNMP::Info::Layer2::Airespace> for details.
 
+=item SNMP::Info::Layer2::Aerohive
+
+Subclass for Aerohive Access Points.
+
+See documentation in L<SNMP::Info::Layer2::Aerohive> for details.
+
 =item SNMP::Info::Layer2::Aironet
 
 Class for Cisco Aironet wireless devices that run IOS.  See also
@@ -750,7 +750,7 @@ See documentation in L<SNMP::Info::Layer3::BayRS> for details.
 
 =item SNMP::Info::Layer3::BlueCoatSG
 
-Subclass for Blue Coat SG series proxy devices.
+Subclass for BlueCoat SG series proxy devices.
 
 See documentation in L<SNMP::Info::Layer3::BlueCoatSG> for details.
 
@@ -822,12 +822,6 @@ Subclass for Cumulus Networks Routers.
 
 See documentation in L<SNMP::Info::Layer3::Cumulus> for details.
 
-=item SNMP::Info::Layer3::DLink
-
-Subclass for DLink devices.
-
-See documentation in L<SNMP::Info::Layer3::DLink> for details.
-
 =item SNMP::Info::Layer3::Dell
 
 Subclass for Dell PowerConnect switches. The IBM BladeCenter
@@ -836,6 +830,12 @@ also use this module based upon MIB support.
 
 See documentation in L<SNMP::Info::Layer3::Dell> for details.
 
+=item SNMP::Info::Layer3::DLink
+
+Subclass for DLink devices.
+
+See documentation in L<SNMP::Info::Layer3::DLink> for details.
+
 =item SNMP::Info::Layer3::Enterasys
 
 Subclass for Enterasys devices.
@@ -2852,17 +2852,17 @@ For protocol specific information and implementation:
 
 =over
 
-=item LLDP: See L<SNMP::Info::LLDP> for details.
+=item AMAP: See L<SNMP::Info::AMAP> for details.
 
 =item CDP: See L<SNMP::Info::CDP> for details.
 
-=item SONMP: See L<SNMP::Info::SONMP> for details.
+=item EDP: See L<SNMP::Info::EDP> for details.
 
 =item FDP: See L<SNMP::Info::FDP> for details.
 
-=item EDP: See L<SNMP::Info::EDP> for details.
+=item LLDP: See L<SNMP::Info::LLDP> for details.
 
-=item AMAP: See L<SNMP::Info::AMAP> for details.
+=item SONMP: See L<SNMP::Info::SONMP> for details.
 
 =back
 
@@ -3638,7 +3638,7 @@ Makes human friendly speed ratings using C<%SPEED_MAP>.
  %SPEED_MAP = (
                 '56000'      => '56 kbps',
                 '64000'      => '64 kbps',
-                '115000'     => '115 kpbs',
+                '115000'     => '115 kbps',
                 '1500000'    => '1.5 Mbps',
                 '1536000'    => 'T1',
                 '1544000'    => 'T1',
@@ -3649,9 +3649,9 @@ Makes human friendly speed ratings using C<%SPEED_MAP>.
                 '4000000'    => '4.0 Mbps',
                 '10000000'   => '10 Mbps',
                 '11000000'   => '11 Mbps',
-                '20000000'   => '20 Mbps',
                 '16000000'   => '16 Mbps',
                 '16777216'   => '16 Mbps',
+                '20000000'   => '20 Mbps',
                 '44210000'   => 'T3',
                 '44736000'   => 'T3',
                 '45000000'   => '45 Mbps',
@@ -3661,11 +3661,11 @@ Makes human friendly speed ratings using C<%SPEED_MAP>.
                 '54000000'   => '54 Mbps',
                 '64000000'   => '64 Mbps',
                 '100000000'  => '100 Mbps',
-                '200000000'  => '200 Mbps',
                 '149760000'  => 'ATM on OC-3',
                 '155000000'  => 'OC-3',
                 '155519000'  => 'OC-3',
                 '155520000'  => 'OC-3',
+                '200000000'  => '200 Mbps',
                 '400000000'  => '400 Mbps',
                 '599040000'  => 'ATM on OC-12',
                 '622000000'  => 'OC-12',
@@ -3685,7 +3685,7 @@ munge_highspeed(). SNMP::Info can return speeds up to terabit levels this way.
 %SPEED_MAP = (
     '56000'      => '56 kbps',
     '64000'      => '64 kbps',
-    '115000'     => '115 kpbs',
+    '115000'     => '115 kbps',
     '1500000'    => '1.5 Mbps',
     '1536000'    => 'T1',
     '1544000'    => 'T1',
@@ -3696,9 +3696,9 @@ munge_highspeed(). SNMP::Info can return speeds up to terabit levels this way.
     '4000000'    => '4.0 Mbps',
     '10000000'   => '10 Mbps',
     '11000000'   => '11 Mbps',
-    '20000000'   => '20 Mbps',
     '16000000'   => '16 Mbps',
     '16777216'   => '16 Mbps',
+    '20000000'   => '20 Mbps',
     '44210000'   => 'T3',
     '44736000'   => 'T3',
     '45000000'   => '45 Mbps',
@@ -3708,11 +3708,11 @@ munge_highspeed(). SNMP::Info can return speeds up to terabit levels this way.
     '54000000'   => '54 Mbps',
     '64000000'   => '64 Mbps',
     '100000000'  => '100 Mbps',
-    '200000000'  => '200 Mbps',
     '149760000'  => 'ATM on OC-3',
     '155000000'  => 'OC-3',
     '155519000'  => 'OC-3',
     '155520000'  => 'OC-3',
+    '200000000'  => '200 Mbps',
     '400000000'  => '400 Mbps',
     '599040000'  => 'ATM on OC-12',
     '622000000'  => 'OC-12',