diff --git a/includes/discovery/fanspeeds.php b/includes/discovery/fanspeeds.php
index 2790c950d..fea800aca 100644
--- a/includes/discovery/fanspeeds.php
+++ b/includes/discovery/fanspeeds.php
@@ -52,19 +52,19 @@ if ($device['os'] == "linux")
       $index = $split_oid[count($split_oid)-1];
       if ($kind == 0)
       {
-        $oid       = "1.3.6.1.4.1.10876.2.1.1.1.1.4$index";
-        $descr_oid     = "1.3.6.1.4.1.10876.2.1.1.1.1.2$index";
-        $limit_oid     = "1.3.6.1.4.1.10876.2.1.1.1.1.6$index";
-        $precision_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.9$index";
-        $monitor_oid   = "1.3.6.1.4.1.10876.2.1.1.1.1.10$index";
+        $fan_oid       = "1.3.6.1.4.1.10876.2.1.1.1.1.4.$index";
+        $descr_oid     = "1.3.6.1.4.1.10876.2.1.1.1.1.2.$index";
+        $limit_oid     = "1.3.6.1.4.1.10876.2.1.1.1.1.6.$index";
+        $precision_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.9.$index";
+        $monitor_oid   = "1.3.6.1.4.1.10876.2.1.1.1.1.10.$index";
         $descr         = snmp_get($device, $descr_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB");
-        $current       = snmp_get($device, $oid, "-Oqv", "SUPERMICRO-HEALTH-MIB");
+        $current       = snmp_get($device, $fan_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB");
         $limit         = snmp_get($device, $limit_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB");
         $precision     = snmp_get($device, $precision_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB");
         $monitor       = snmp_get($device, $monitor_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB");
         if ($monitor == 'true')
         {
-          discover_fan($device, $oid, $index, $type, $descr, $precision = 1, NULL, $limit, $current);
+          echo discover_fan($device, $fan_oid, $index, $type, $descr, $precision = 1, NULL, $limit, $current);
           $fan_exists[$type][$index] = 1;
         }
       }
@@ -81,9 +81,9 @@ if ($query = mysql_query($sql))
 {
   while ($test_fan = mysql_fetch_array($query)) 
   {  
-    if($debug) { echo("$fan_type -> $fan_index\n"); }
     $fan_index = $test_fan['fan_index'];
     $fan_type = $test_fan['fan_type'];
+    if($debug) { echo("$fan_type -> $fan_index\n"); }
     if(!$fan_exists[$fan_type][$fan_index]) {
       echo("-");
       mysql_query("DELETE FROM `fanspeed` WHERE fan_id = '" . $test_fan['fan_id'] . "'");
diff --git a/mibs/junose/.index b/mibs/junose/.index
index 0dafe6a07..a99520932 100644
--- a/mibs/junose/.index
+++ b/mibs/junose/.index
@@ -1,164 +1,164 @@
-IPV6-TC mib-rfc2465tc.txt
-PPVPN-TC-MIB mib-vpntcmib.txt
-ATM-FORUM-MIB mib-ilmim.txt
-RSTP-MIB mib-rfc4318.txt
-SNMPv2-MIB mib-rfc1907.txt
-Juniper-PPPOE-PROFILE-MIB juniPppoeProfile.mi2
-IP-FORWARD-MIB mib-rtmib.txt
-GMPLS-TE-STD-MIB mib-rfc4802.txt
-IF-MIB mib-rfc2863a.txt
-ISIS-MIB mib-isismib.txt
-ADSL-TC-MIB mib-rfc2662tc.txt
-Juniper-POLICY-MIB juniPolicy.mi2
-Juniper-IGMP-MIB juniIgmp.mi2
-FR-MFR-MIB mib-rfc3020.txt
-Juniper-TC juniTc.mi2
-Juniper-LICENSE-MIB juniLicense.mi2
-HCNUM-TC mib-rfc2856a.txt
-RMON-MIB mib-rfc2819a.txt
-DS1-MIB mib-rfc2495a.txt
-Juniper-ROUTER-MIB juniRouter.mi2
-Juniper-ISIS-MIB juniIsIs.mi2
-HOST-RESOURCES-MIB mib-rfc2790a.txt
-P-BRIDGE-MIB mib-rfc4363a.txt
-PerfHist-TC-MIB mib-rfc2493.txt
-SYSAPPL-MIB mib-rfc2287a.txt
-Juniper-ETHERNET-MIB juniEthernet.mi2
-TCP-MIB mib-rfc2012a.txt
-Juniper-DS3-MIB juniDs3.mi2
-Juniper-DS1-MIB juniDs1.mi2
-IANA-GMPLS-TC-MIB mib-IANA-GMPLS-TC-MIB.txt
-Juniper-REDUNDANCY-MIB juniRedundancy.mi2
-Juniper-BGP-MIB juniBgp.mi2
-TRANSPORT-ADDRESS-MIB mib-rfc3419.txt
-Juniper-IP-POLICY-MIB juniIpPolicy.mi2
-Juniper-HDLC-MIB juniHdlc.mi2
-PIM-MIB mib-pimmib.txt
-Juniper-AAA-MIB juniAaa.mi2
-Juniper-IPsec-Tunnel-MIB juniIpsecTunnel.mi2
-Juniper-System-MIB juniSystem.mi2
-RMON2-MIB mib-rfc4502.txt
-Juniper-Products-MIB juniProducts.mi2
-IANAifType-MIB mib-IANAifType-MIB.txt
-Juniper-SNMP-MIB juniSnmp.mi2
-DISMAN-TRACEROUTE-MIB mib-rfc2925b.txt
-JUNIPER-EXPERIMENT-MIB jnxExperiment.mi2
-OPT-IF-MIB mib-rfc3591.txt
-LLDP-MIB mib-lldp.txt
-Juniper-HTTP-Profile-MIB juniHttpProfile.mi2
-SNMP-FRAMEWORK-MIB mib-rfc2571.txt
-Juniper-RADIUS-CLIENT-MIB juniRadClient.mi2
-ENTITY-MIB ENTITY-MIB.my
-Juniper-Bridging-Manager-MIB juniBridgingMgr.mi2
-UDP-MIB mib-rfc2013a.txt
-VRRP-MIB mib-rfc2787a.txt
-Juniper-DVMRP-MIB juniDvmrp.mi2
-POWER-ETHERNET-MIB mib-rfc3621.txt
-Juniper-PROFILE-MIB juniProfile.mi2
-Juniper-ATM-1483-Profile-MIB juniAtmProfile.mi2
-Juniper-ADDRESS-POOL-MIB juniAddrPool.mi2
-ATM-MIB mib-rfc2515a.txt
-Juniper-PPP-MIB juniPpp.mi2
-Juniper-ES2-Registry juniEs2Registry.mi2
-SNMPv2-SMI mib-SNMPv2-SMI.txt
-SNMP-COMMUNITY-MIB mib-rfc2576.txt
-Juniper-DHCP-MIB juniDhcp.mi2
-SNMP-MPD-MIB mib-rfc2572.txt
-OSPF-MIB mib-ospf2mib.txt
-SNMP-TARGET-MIB mib-rfc3413target.txt
-Juniper-IP-TUNNEL-MIB juniIpTunnel.mi2
-ADSL-LINE-MIB mib-rfc2662.txt
-Juniper-FILE-XFER-MIB juniFileXfer.mi2
-Juniper-ERX-Registry juniErxRegistry.mi2
-IPMROUTE-MIB mib-mroutemib.txt
-Juniper-FRAME-RELAY-MIB juniFr.mi2
-SNA-SDLC-MIB mib-rfc1747.txt
-Juniper-System-Clock-MIB juniSystemClock.mi2
-OSPF-TRAP-MIB mib-ospf2trap.txt
-Juniper-UNI-SMI juniSmi.mi2
-SONET-MIB mib-rfc3592.txt
-Juniper-L2TP-MIB juniL2tp.mi2
-Juniper-DHCPv6-MIB juniDhcpv6.mi2
-ESO-CONSORTIUM-MIB mib-eso-consortium.txt
-Juniper-IPV6-PROFILE-MIB juniIpv6Profile.mi2
-Juniper-HOST-MIB juniHost.mi2
-GMPLS-LSR-STD-MIB mib-rfc4803.txt
-Juniper-DOS-PROTECTION-PLATFORM-MIB juniDosProtectionPlat.mi2
-Juniper-QoS-MIB juniQos.mi2
-Juniper-CLI-MIB juniCli.mi2
-SNMPv2-TC mib-SNMPv2-TC.txt
-Juniper-BRIDGE-MIB juniBridge.mi2
-MPLS-TE-STD-MIB mib-rfc3812.txt
-Juniper-SSC-CLIENT-MIB juniSscClient.mi2
-Juniper-HTTP-MIB juniHttp.mi2
-PTOPO-MIB mib-rfc2922.txt
-Juniper-AUTOCONFIGURE-MIB juniAutoconf.mi2
-DLSW-MIB mib-rfc2024a.txt
-HOST-RESOURCES-TYPES mib-rfc2790type.txt
-FRAME-RELAY-DTE-MIB mib-rfc2115a.txt
-Juniper-MROUTER-MIB juniMRouter.mi2
 Juniper-DISMAN-EVENT-MIB juniDismanEvent.mi2
-JUNIPER-SMI jnxSmi.mi2
-INET-ADDRESS-MIB mib-rfc2851.txt
-IP-MIB mib-rfc2011a.txt
-Juniper-PPPOE-MIB juniPppoe.mi2
-Juniper-TSM-MIB juniTSM.mi2
 Juniper-UNI-IF-MIB juniIf.mi2
-Juniper-DNS-MIB juniDns.mi2
-INTEGRATED-SERVICES-MIB mib-rfc2213.txt
-IANA-RTPROTO-MIB mib-IANA-RTPROTO-MIB.txt
-EtherLike-MIB mib-rfc2665a.txt
-Juniper-FRACTIONAL-T1-MIB juniFt1.mi2
-IEEE8021-PAE-MIB mib-ieee8021pae.txt
+Juniper-System-MIB juniSystem.mi2
+Juniper-IP-TUNNEL-MIB juniIpTunnel.mi2
 IGMP-STD-MIB mib-igmpmib.txt
-BGP4-MIB mib-bgpmib.txt
-Q-BRIDGE-MIB mib-rfc4363b.txt
-Juniper-PPP-PROFILE-MIB juniPppProfile.mi2
-DS3-MIB mib-rfc3896.txt
-Juniper-RADIUS-Proxy-MIB juniRadProxy.mi2
-IPV6-MIB mib-rfc2465.txt
-DIFFSERV-MIB mib-rfc3289.txt
-IPMROUTE-STD-MIB mib-rfc2932.txt
-DVMRP-STD-MIB-JUNI draft-ietf-idmr-dvmrp-mib-11-juni.mi2
-Juniper-ACCOUNTING-MIB juniAcctng.mi2
-BRIDGE-MIB mib-rfc4188.txt
-SNMP-PROXY-MIB mib-rfc3413.txt
-TOKEN-RING-RMON-MIB mib-rfc1513.txt
-GMPLS-TC-STD-MIB mib-rfc4801.txt
-Juniper-SLEP-MIB juniSlep.mi2
-Juniper-MIBs juniMibs.mi2
-Juniper-IKE-MIB juniIke.mi2
-SNMP-USER-BASED-SM-MIB mib-rfc2574.txt
-Juniper-COPS-MIB juniCops.mi2
-MPLS-TC-STD-MIB mib-rfc3811.txt
-Juniper-DOS-PROTECTION-MIB juniDosProtection.mi2
+ADSL-LINE-MIB mib-rfc2662.txt
+Juniper-POLICY-MIB juniPolicy.mi2
+Juniper-MROUTER-MIB juniMRouter.mi2
+TRANSPORT-ADDRESS-MIB mib-rfc3419.txt
+Juniper-HDLC-MIB juniHdlc.mi2
 DRAFT-MSDP-MIB mib-msdpmib.txt
-Juniper-BRIDGE-ETHERNET-MIB juniBridgeEthernet.mi2
-MPLS-LSR-STD-MIB mib-rfc3813.txt
-IEEE8023-LAG-MIB mib-802.3ad.txt
-MPLS-VPN-MIB mib-l3vpnmib.txt
 Juniper-RADIUS-Initiated-Request-MIB juniRadRequest.mi2
-Juniper-ERX-System-MIB juniErxSystem.mi2
-Juniper-Experiment juniExperiment.mi2
-Juniper-TACACS-Plus-Client-MIB juniTcsClient.mi2
-Juniper-OSPF-MIB juniOspf.mi2
-SNMPv2-TM mib-rfc3417.txt
-ATM-TC-MIB mib-rfc2514.txt
-Juniper-IP-PROFILE-MIB juniIpProfile.mi2
-APS-MIB-JUNI draft-ietf-atommib-sonetaps-mib-05-juni.mi2
+Juniper-SLEP-MIB juniSlep.mi2
+P-BRIDGE-MIB mib-rfc4363a.txt
+Juniper-SNMP-MIB juniSnmp.mi2
+PTOPO-MIB mib-rfc2922.txt
 Juniper-PIM-MIB juniPim.mi2
-DISMAN-PING-MIB mib-rfc2925a.txt
-Juniper-UNI-SONET-MIB juniSonet.mi2
-Juniper-IP-MIB juniIp.mi2
+FR-MFR-MIB mib-rfc3020.txt
+Juniper-ISIS-MIB juniIsIs.mi2
 Juniper-UNI-ATM-MIB juniAtm.mi2
-Juniper-PACKET-MIRROR-MIB juniPacketMirror.mi2
-Juniper-SUBSCRIBER-MIB juniSubscriber.mi2
-Juniper-V35-MIB juniV35.mi2
-Juniper-L2TP-Dialout-MIB juniL2tpDialout.mi2
-SNMP-NOTIFICATION-MIB mib-rfc3413notify.txt
-BGP4-V2-MIB-JUNIPER draft-ietf-idr-bgp4-mibv2-03-jnx.mi2
-Juniper-RADIUS-Disconnect-MIB juniRadDiscon.mi2
+FRAME-RELAY-DTE-MIB mib-rfc2115a.txt
+Juniper-PPP-MIB juniPpp.mi2
+OSPF-TRAP-MIB mib-ospf2trap.txt
+IPMROUTE-STD-MIB mib-rfc2932.txt
+IPV6-MIB mib-rfc2465.txt
+GMPLS-TC-STD-MIB mib-rfc4801.txt
 DIFFSERV-DSCP-TC mib-diffServDscp-tc.txt
 SNMP-VIEW-BASED-ACM-MIB mib-rfc2575.txt
+Juniper-ETHERNET-MIB juniEthernet.mi2
+Juniper-RADIUS-CLIENT-MIB juniRadClient.mi2
+INTEGRATED-SERVICES-MIB mib-rfc2213.txt
+HCNUM-TC mib-rfc2856a.txt
+Juniper-IKE-MIB juniIke.mi2
+ESO-CONSORTIUM-MIB mib-eso-consortium.txt
+DISMAN-PING-MIB mib-rfc2925a.txt
+MPLS-LSR-STD-MIB mib-rfc3813.txt
+IEEE8023-LAG-MIB mib-802.3ad.txt
+Juniper-IP-POLICY-MIB juniIpPolicy.mi2
+SONET-MIB mib-rfc3592.txt
+Juniper-IPV6-PROFILE-MIB juniIpv6Profile.mi2
+Juniper-ERX-System-MIB juniErxSystem.mi2
+DISMAN-TRACEROUTE-MIB mib-rfc2925b.txt
+JUNIPER-SMI jnxSmi.mi2
+TOKEN-RING-RMON-MIB mib-rfc1513.txt
+IPMROUTE-MIB mib-mroutemib.txt
+IEEE8021-PAE-MIB mib-ieee8021pae.txt
+DS3-MIB mib-rfc3896.txt
+Juniper-IPsec-Tunnel-MIB juniIpsecTunnel.mi2
+INET-ADDRESS-MIB mib-rfc2851.txt
+LLDP-MIB mib-lldp.txt
+HOST-RESOURCES-MIB mib-rfc2790a.txt
+SNMP-PROXY-MIB mib-rfc3413.txt
+Juniper-ERX-Registry juniErxRegistry.mi2
+APS-MIB-JUNI draft-ietf-atommib-sonetaps-mib-05-juni.mi2
+BRIDGE-MIB mib-rfc4188.txt
+Juniper-AAA-MIB juniAaa.mi2
+Juniper-Products-MIB juniProducts.mi2
+Juniper-PACKET-MIRROR-MIB juniPacketMirror.mi2
+Juniper-TACACS-Plus-Client-MIB juniTcsClient.mi2
+IPV6-TC mib-rfc2465tc.txt
+SNMP-FRAMEWORK-MIB mib-rfc2571.txt
+Juniper-HOST-MIB juniHost.mi2
+SNMPv2-MIB mib-rfc1907.txt
+Juniper-DHCP-MIB juniDhcp.mi2
+Juniper-FRAME-RELAY-MIB juniFr.mi2
+Juniper-REDUNDANCY-MIB juniRedundancy.mi2
+Juniper-ROUTER-MIB juniRouter.mi2
+Juniper-SSC-CLIENT-MIB juniSscClient.mi2
+Juniper-TSM-MIB juniTSM.mi2
+Juniper-DS1-MIB juniDs1.mi2
+Juniper-BRIDGE-ETHERNET-MIB juniBridgeEthernet.mi2
+Juniper-TC juniTc.mi2
+IANAifType-MIB mib-IANAifType-MIB.txt
+Juniper-System-Clock-MIB juniSystemClock.mi2
+SNMP-NOTIFICATION-MIB mib-rfc3413notify.txt
+DS1-MIB mib-rfc2495a.txt
+ISIS-MIB mib-isismib.txt
+Juniper-V35-MIB juniV35.mi2
+ADSL-TC-MIB mib-rfc2662tc.txt
+Juniper-DNS-MIB juniDns.mi2
+Juniper-HTTP-MIB juniHttp.mi2
+Juniper-DOS-PROTECTION-MIB juniDosProtection.mi2
+Juniper-ES2-Registry juniEs2Registry.mi2
+Q-BRIDGE-MIB mib-rfc4363b.txt
+Juniper-PROFILE-MIB juniProfile.mi2
+Juniper-IP-MIB juniIp.mi2
+Juniper-ATM-1483-Profile-MIB juniAtmProfile.mi2
+SNMP-USER-BASED-SM-MIB mib-rfc2574.txt
+SNMP-MPD-MIB mib-rfc2572.txt
+Juniper-DOS-PROTECTION-PLATFORM-MIB juniDosProtectionPlat.mi2
+HOST-RESOURCES-TYPES mib-rfc2790type.txt
+Juniper-Experiment juniExperiment.mi2
+SYSAPPL-MIB mib-rfc2287a.txt
+PerfHist-TC-MIB mib-rfc2493.txt
+TCP-MIB mib-rfc2012a.txt
+Juniper-UNI-SMI juniSmi.mi2
+PPVPN-TC-MIB mib-vpntcmib.txt
+RMON-MIB mib-rfc2819a.txt
+ATM-FORUM-MIB mib-ilmim.txt
+Juniper-DVMRP-MIB juniDvmrp.mi2
+DLSW-MIB mib-rfc2024a.txt
+Juniper-ADDRESS-POOL-MIB juniAddrPool.mi2
+Juniper-LICENSE-MIB juniLicense.mi2
+Juniper-DS3-MIB juniDs3.mi2
+Juniper-FRACTIONAL-T1-MIB juniFt1.mi2
+Juniper-COPS-MIB juniCops.mi2
 Juniper-Registry juniRegistry.mi2
+Juniper-UNI-SONET-MIB juniSonet.mi2
+POWER-ETHERNET-MIB mib-rfc3621.txt
+Juniper-L2TP-MIB juniL2tp.mi2
+UDP-MIB mib-rfc2013a.txt
+Juniper-HTTP-Profile-MIB juniHttpProfile.mi2
+EtherLike-MIB mib-rfc2665a.txt
+MPLS-TC-STD-MIB mib-rfc3811.txt
+SNMP-COMMUNITY-MIB mib-rfc2576.txt
+Juniper-AUTOCONFIGURE-MIB juniAutoconf.mi2
+MPLS-TE-STD-MIB mib-rfc3812.txt
+SNMPv2-SMI mib-SNMPv2-SMI.txt
+SNMPv2-TC mib-SNMPv2-TC.txt
+BGP4-V2-MIB-JUNIPER draft-ietf-idr-bgp4-mibv2-03-jnx.mi2
+PIM-MIB mib-pimmib.txt
+Juniper-IGMP-MIB juniIgmp.mi2
+IANA-GMPLS-TC-MIB mib-IANA-GMPLS-TC-MIB.txt
+Juniper-ACCOUNTING-MIB juniAcctng.mi2
+Juniper-MIBs juniMibs.mi2
+Juniper-RADIUS-Disconnect-MIB juniRadDiscon.mi2
+Juniper-BRIDGE-MIB juniBridge.mi2
+MPLS-VPN-MIB mib-l3vpnmib.txt
+Juniper-PPP-PROFILE-MIB juniPppProfile.mi2
+Juniper-L2TP-Dialout-MIB juniL2tpDialout.mi2
+Juniper-RADIUS-Proxy-MIB juniRadProxy.mi2
+VRRP-MIB mib-rfc2787a.txt
+Juniper-FILE-XFER-MIB juniFileXfer.mi2
+Juniper-PPPOE-MIB juniPppoe.mi2
+GMPLS-TE-STD-MIB mib-rfc4802.txt
+Juniper-BGP-MIB juniBgp.mi2
 Juniper-LOG-MIB juniLog.mi2
+Juniper-QoS-MIB juniQos.mi2
+Juniper-OSPF-MIB juniOspf.mi2
+Juniper-Bridging-Manager-MIB juniBridgingMgr.mi2
+RMON2-MIB mib-rfc4502.txt
+IP-FORWARD-MIB mib-rtmib.txt
+SNMPv2-TM mib-rfc3417.txt
+IF-MIB mib-rfc2863a.txt
+SNA-SDLC-MIB mib-rfc1747.txt
+ATM-MIB mib-rfc2515a.txt
+IANA-RTPROTO-MIB mib-IANA-RTPROTO-MIB.txt
+Juniper-PPPOE-PROFILE-MIB juniPppoeProfile.mi2
+SNMP-TARGET-MIB mib-rfc3413target.txt
+Juniper-CLI-MIB juniCli.mi2
+BGP4-MIB mib-bgpmib.txt
+DVMRP-STD-MIB-JUNI draft-ietf-idmr-dvmrp-mib-11-juni.mi2
+IP-MIB mib-rfc2011a.txt
+DIFFSERV-MIB mib-rfc3289.txt
+ENTITY-MIB ENTITY-MIB.my
+RSTP-MIB mib-rfc4318.txt
+Juniper-SUBSCRIBER-MIB juniSubscriber.mi2
+Juniper-DHCPv6-MIB juniDhcpv6.mi2
+OPT-IF-MIB mib-rfc3591.txt
+OSPF-MIB mib-ospf2mib.txt
+Juniper-IP-PROFILE-MIB juniIpProfile.mi2
+GMPLS-LSR-STD-MIB mib-rfc4803.txt
+JUNIPER-EXPERIMENT-MIB jnxExperiment.mi2
+ATM-TC-MIB mib-rfc2514.txt