diff --git a/malware3.pl b/malware3.pl
index e2e9f20..a2fae4e 100644
--- a/malware3.pl
+++ b/malware3.pl
@@ -584,7 +584,8 @@ foreach my $file (sort @files) {
         next if $file eq 'user-edit.php';
         next if $file eq 'custom-facebook-feed-admin.php';
         next if $file eq 'membershipadmin.php';
-
+        next if $file eq 'wppa-settings-autosave.php';
+        
         print "Scanning $start_dir/$file... ";
 
         unless (-r "$start_dir/$file") {
diff --git a/sc.php b/sc.php
index bebc8ca..8f9ffd4 100644
--- a/sc.php
+++ b/sc.php
@@ -1098,6 +1098,9 @@ $versions = array(
     array("Drupal", "/modules/system/system.info", "version = "),
     array("Joomla 1.0", "/includes/version.php", "\$RELEASE\|\$DEV_LEVEL"),
     array("Joomla 1.5", "/libraries/joomla/version.php", "\$RELEASE\ =\|\$DEV_LEVEL\ ="),
+    array("Joomla 2.5", "/libraries/cms/version.php", "\$RELEASE\ =\|\$DEV_LEVEL\ ="),
+    array("Joomla 3.x", "/libraries/cms/version/version.php", "\$RELEASE\ =\|\$DEV_LEVEL\ ="),
+    array("Joomla 3.5+", "/libraries/cms/version/version.php", "const\ RELEASE\ =\|const\ DEV_LEVEL\ ="),
     array("phpBB", "/includes/constants.php", "define('PHPBB_VERSION',"),
     array("SMF", "/index.php", "\$forum_version = 'SMF"),
     array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
@@ -1242,22 +1245,21 @@ $versions = array(
     array("AccountLab Plus", "/version.php", "ALPversion="), // needs one more line
     array("Flynax Classifieds", "/control.inc.php", "VERSION:"), // may need one more line
     array("vBulletin", "/version.php", "fr_version ="), // may need one more line
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
-    array("Gallery", "/modules/gallery/helpers/gallery.php", "const VERSION ="),
+    array("PHP Pro Bid", "/index.php", "PHP Pro Bid v"), // needs one more line
+    array("ITLPoll", "/index.php", "ITLPoll Version"), // needs one more line
+    array("Openads", "/index.php", "\/\* Openads"), // needs one more line
+    array("phpFormGenerator", "/index.php", "<title>phpFormGenerator v"), // needs one more line
+    array("LightMon Engine", "/index.php", "*           LightMon v"), // needs one more line
+    array("Kasseler CMS", "/index.php", "by Kasseler CMS"), // needs 4 more lines
+    array("Silurus Classifieds Builder", "/index.php", "* Silurus Classifieds Builder"), // needs 7 more lines
+    array("Bitweaver", "/config_defaults_inc.php", "BIT_MAJOR_VERSION"), // needs 3 more
+    array("phpFoX", "/version.php", "\$_CONF\[\'info.version\'\] ="), // needs one more
+    array("Open Conference System", "/version.xml", "<release>"), // needs one more
+    array("SPIP", "/svn.revision", "Origine: svn:"), // needs one more
+    array("Exponent", "/exponent_version.php", "EXPONENT_VERSION_MAJOR"), // needs 7 more
+    array("Oxy Classifieds", "/version", "*"), // two from the head
+    array("Anova Pro", "/version.txt", "Anova Pro :"), // one more
+    array("Timthumb", "/*.php", "define ('VERSION',"), // produces too many false positives
 
 );
 
@@ -1277,59 +1279,7 @@ foreach(glob("./{**/*,*}".$row[1], GLOB_BRACE) as $versionfile){
   }
 }
 
-echo $GLOBALS["red"] . $GLOBALS["br"] . "PHP Pro Bid<br /><br /></span>";
-system("find ../ -name index.php -exec grep -HA1 'PHP Pro Bid v' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "ITLPoll<br /><br /></span>";
-system("find ../ -name index.php -exec grep -HA1 'ITLPoll Version ' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Openads<br /><br /></span>";
-system("find ../ -name index.php -exec grep -HA1 '\/\* Openads ' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "phpFormGenerator<br /><br /></span>";
-system("find ../ -name index.php -exec grep -HA1 '\<title\>phpFormGenerator v' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "LightMon Engine<br /><br /></span>";
-system("find ../ -name index.php -exec grep -HA1 '  *           LightMon v' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Kasseler CMS<br /><br /></span>";
-system("find ../ -name index.php -exec grep -HA4 'by Kasseler CMS' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Silurus Classifieds Builder<br /></span>";
-system("find ../ -name index.php -exec grep -HA7 '* Silurus Classifieds Builder' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Bitweaver<br /></span>";
-system("find ../ -name config_defaults_inc.php -exec grep -HA3 'BIT_MAJOR_VERSION' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "phpFoX<br /></span>";
-system("find ../ -name version.php -exec grep -HA1 '\$_CONF\[\'info.version\'\] =' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Open Conference System<br /></span>";
-system("find ../ -name version.xml -exec grep -HA1 '\<release\>' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "SPIP<br /></span>";
-system("find ../ -name svn.revision -exec grep -HA1 'Origine: svn:' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Exponent<br /></span>";
-system("find ../ -name exponent_version.php -exec grep -HA7 'EXPONENT_VERSION_MAJOR' {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Oxy Classifieds<br /></span>";
-system("find ../ -name version -exec head -n 2 {} \;");
-
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Anova Pro<br /></span>";
-system("find ../ -name version.txt -exec grep -HA1 'Anova Pro :' {} \;");
-echo $GLOBALS["red"] . $GLOBALS["br"] . "Joomla<br /><br /></span>";
-system ("find ../ -type f -path '*/includes/version.php' -exec grep -H '\$RELEASE\|\$DEV_LEVEL' {} \; ");
-system ("find ../ -type f -path '*/libraries/joomla/version.php' -exec grep -H '\$RELEASE\ =\|\$DEV_LEVEL\ =' {} \; ");
-system ("find ../ -type f -path '*/libraries/cms/version.php' -exec grep -H '\$RELEASE\ =\|\$DEV_LEVEL\ =' {} \; ");
-system ("find ../ -type f -path '*/libraries/cms/version/version.php' -exec grep -H '\$RELEASE\ =\|\$DEV_LEVEL\ =' {} \; ");
-system ("find ../ -type f -path '*/libraries/cms/version/version.php' -exec grep -H 'const\ RELEASE\ =\|const\ DEV_LEVEL\ =' {} \; ");
-//echo $GLOBALS["red"] . $GLOBALS["br"] . "Timthumb<br /><br /></span>";
-//system("find ../ type f -name '*.php'  
-    
-
-/* echo $GLOBALS["red"] . $GLOBALS["br"] . "Question2Answer<br /></span>";
-system("find ../ -name VERSION.txt -exec head -n 1 {} \;"); - this causes too many false positives */
+ 
 }