diff --git a/Info.pm b/Info.pm
index aebcf4c1..767f84ec 100644
--- a/Info.pm
+++ b/Info.pm
@@ -1312,7 +1312,7 @@ sub update {
 =head2 Data is Cached
 
 Methods and subroutines requesting data from a device will only load the data
-once, and then return cached versions of that data. 
+once, and then return cached versions of that data.
 
 Run $info->load_METHOD() where method is something like 'i_name' to reload
 data from a method.
@@ -1320,7 +1320,7 @@ data from a method.
 Run $info->clear_cache() to clear the cache to allow reload of both globals
 and table methods.
 
-The cache can be retreved or set using the $info->cache() method. This works
+The cache can be retrieved or set using the $info->cache() method. This works
 together with the C<Offline> option.
 
 =head2 Object Scalar Methods
diff --git a/README b/README
index 85667929..3bf732ed 100644
--- a/README
+++ b/README
@@ -981,7 +981,7 @@ USAGE
     Run $info->clear_cache() to clear the cache to allow reload of both
     globals and table methods.
 
-    The cache can be retreved or set using the $info->cache() method. This
+    The cache can be retrieved or set using the $info->cache() method. This
     works together with the "Offline" option.
 
   Object Scalar Methods
diff --git a/t/00_local_spelling.t b/t/00_local_spelling.t
index bfc65ce1..2d4c05bf 100644
--- a/t/00_local_spelling.t
+++ b/t/00_local_spelling.t
@@ -18,26 +18,27 @@ __DATA__
 5000BH
 accelar
 acl
-ADSL
+actial
 adsl
+ADSL
 af
 agere
 airespace
 aironet
 airos
-Alcatel
 alcatel
+Alcatel
 alteon
-Altiga
 altiga
+Altiga
 AMAP
 anycast
 AOS
 ap
 APC
 APs
-Arista
 arista
+Arista
 arn
 arp
 aruba
@@ -52,13 +53,15 @@ ATUR
 augenstein
 autonegotiate
 autospecify
-Avaya
 avaya
+Avaya
 baetz
+Barthel
 bayrs
 baystack
 bcn
 begemot
+Bernhard
 bes
 bgp
 bigint
@@ -73,16 +76,20 @@ bulkrepeaters
 bulkwalk
 Bulley
 cabletron
+casted
 catos
 cdp
 centillion
+CER
+CES
 circuitless
 cisco
 cisco's
 ciscovtp
-Citrix
 citrix
+Citrix
 cli
+concentrators
 conf
 config
 contivity
@@ -90,9 +97,11 @@ CPAN
 CPE
 cpu
 ctron
+CVTA
 cyclades
 DataSMART
 datatype
+De
 deauthenticate
 debugsnmp
 dhcp
@@ -112,6 +121,7 @@ enterasys
 EOS
 erszenyi
 ess
+ESXi
 etherlike
 ethernet
 EvolutionOS
@@ -121,12 +131,15 @@ fdb
 fdp
 fenner
 fixups
+fortinet
+Fortinet
+fortios
 FreeBSD
 FS
 fsm
 FTOS
-FWSM
 fwsm
+FWSM
 gbe
 gbesm
 Gbps
@@ -135,40 +148,46 @@ Ghz
 gigabit
 Gorwits
 hartmaier
+huawei
+Huawei
 iana
 ibm
 icf
 ieee
 ietf
 ifindex
+ifStackTable
 igmp
 IgnoreNetSNMPConf
 iid
 iids
 indices
 ingen
-IOS
+InLoopback
 ios
+IOS
 ip
-IPV
 IPv
+IPV
+ISID
 jeroen
 junos
 Kentrox
+Kosmach
 kramarov
 Kraus
 ladvd
 lans
-Lantronix
 lantronix
+Lantronix
 linksys
 lldp
 loopback
 loopdetect
 lorensen
 lsb
-Lucent
 lucent
+Lucent
 luiggi
 lwapp
 macfilter
@@ -177,16 +196,22 @@ maxrepeaters
 mbs
 mckeown
 mda
+MERCHANTABILITY
+mib
 MIB
 mibdirs
-mib
 mibs
-milliwatts
 Mikrotik
+milliwatts
+MLT
+MLX
+MLXe
 msb
 mtu
 multi
 multicast
+multimode
+multiNode
 multiseg
 multivlan
 munge
@@ -195,11 +220,13 @@ namespace
 ndp
 netdisco
 netgear
+NetIron
 netmask
-Netscaler
 netscaler
+Netscaler
 netscreen
 Nic
+Nicolai
 nmm
 nopassword
 nortel
@@ -217,6 +244,8 @@ ospf
 overridable
 PacketFront
 pae
+PAgP
+Palo
 petri
 pfSense
 phy
@@ -224,21 +253,29 @@ pinkoski
 poe
 pov
 powerconnect
+PPI
 procurve
 propvirtual
 proxim
+PSE
 pvid
+PVST
 qbridge
 qos
 queueing
+Quidway
+Rackswitch
 radlan
-Radware
 radware
+Radware
+Ralf
 rapidcity
 readme
 readonly
 rebranded
+retreved
 retrynosuch
+Robbert
 rom
 RouterOS
 rtt
@@ -248,8 +285,9 @@ Schenau
 sergienko
 SG
 sieborger
-SNMP
+Smartport
 snmp
+SNMP
 SNMP's
 snmpv2
 snmpv3
@@ -257,15 +295,19 @@ snmpwalk
 solaris
 SonicWALL
 sonmp
+Sourceforge
+SPBM
 ssid
-SSID's
 SSIDs
+SSID's
 SSL
-Stickland
 stackable
 stdout
+steelhead
 stg
+Stickland
 stp
+subclassesand
 subcomponents
 subnet
 sunos
@@ -283,18 +325,27 @@ TiMOS
 tmnxModel
 todo
 tuttle
+Ubiquiti
 ucsc
+UDP
 unicast
 uninstall
+untagged
 uptime
 vlan
 vlans
+VMware
+VoIP
+VPC
 vpn
+VRP
 VSP
+VSS
 vtp
 watanabe
 wlan
 wlans
 WS
+XMR
 zoltan
 zyxel