diff --git a/metadata/cm.aptoide.pt.txt b/metadata/cm.aptoide.pt.txt
index 4789c71350..dac00b2e09 100644
--- a/metadata/cm.aptoide.pt.txt
+++ b/metadata/cm.aptoide.pt.txt
@@ -17,8 +17,5 @@ Repo:http://aptoide.org/repo/aptoide-client
 Build Version:2.7.0,324,!bad use of version control; non free libraries and inconsistent licensing 817,subdir=2.7.0/Aptoide,update=.;../com_viewpagerindicator,\
 prebuild=echo "android.library.reference.1=../com_viewpagerindicator" >> project.properties 
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.6
-Current Version Code:6
 
diff --git a/metadata/cmupdaterapp.ui.txt b/metadata/cmupdaterapp.ui.txt
index 17db8fd9f7..afc8f6400c 100644
--- a/metadata/cmupdaterapp.ui.txt
+++ b/metadata/cmupdaterapp.ui.txt
@@ -18,8 +18,7 @@ Repo:http://cyanogen-updater.googlecode.com/svn/trunk/
 
 Build Version:5.0.1,501,626
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.6
-Current Version Code:6
+Current Version:5.0.1
+Current Version Code:501
 
diff --git a/metadata/com.agiro.scanner.android.txt b/metadata/com.agiro.scanner.android.txt
index 2fdf35837a..29e02d951e 100644
--- a/metadata/com.agiro.scanner.android.txt
+++ b/metadata/com.agiro.scanner.android.txt
@@ -19,8 +19,5 @@ Repo:https://github.com/pakerfeldt/aGiro.git
 
 Build Version:alpha 2,2,!repo moved and renamed 20bd0f021dd852afcc9aa9008ee713419ae8e05c
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.98
-Current Version Code:44
 
diff --git a/metadata/com.andrewshu.android.reddit.txt b/metadata/com.andrewshu.android.reddit.txt
index a2b64bba5b..a96fe279dd 100644
--- a/metadata/com.andrewshu.android.reddit.txt
+++ b/metadata/com.andrewshu.android.reddit.txt
@@ -28,8 +28,7 @@ Build Version:1.3.0,83,v1.3.0,target=android-11,prebuild=mkdir lib && mv libs-de
 Build Version:2.1.1,91,!No source in repo
 Build Version:2.2,92,!No source in repo
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
+Current Version:1.3.0
+Current Version Code:83
 
diff --git a/metadata/com.android.inputmethod.norwegian.txt b/metadata/com.android.inputmethod.norwegian.txt
index ef7ad29083..d3e31bf99a 100644
--- a/metadata/com.android.inputmethod.norwegian.txt
+++ b/metadata/com.android.inputmethod.norwegian.txt
@@ -22,9 +22,8 @@ Repo:http://code.google.com/p/scandinavian-keyboard
 #For android-15 only
 Build Version:1.4.7,16,9515ee354b59,target=android-4
 
-Auto Update Mode:None
 #Device-variable
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
+Current Version:1.4.6
+Current Version Code:15
 
diff --git a/metadata/com.anysoftkeyboard.languagepack.russian2.txt b/metadata/com.anysoftkeyboard.languagepack.russian2.txt
index ed17a1b7a5..2f0e3d1a12 100644
--- a/metadata/com.anysoftkeyboard.languagepack.russian2.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.russian2.txt
@@ -29,6 +29,4 @@ sed -i '/key/d' project.properties
 
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:20120613-persian-numbers
-Current Version Code:4
 
diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt
index 93a95cc27f..4d8aff2665 100644
--- a/metadata/com.bwx.bequick.txt
+++ b/metadata/com.bwx.bequick.txt
@@ -25,8 +25,7 @@ Build Version:1.9.9.2,201106160,213,target=android-8
 Build Version:1.9.9.3,201107260,220,target=android-8
 Build Version:1.9.10,201207300,!Source has disappeared
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:Copter-GCS
-Current Version Code:10
+Current Version:1.9.9.3
+Current Version:201107260
 
diff --git a/metadata/com.bwx.qs.battery.txt b/metadata/com.bwx.qs.battery.txt
index 96299d312e..1802ddc8bc 100644
--- a/metadata/com.bwx.qs.battery.txt
+++ b/metadata/com.bwx.qs.battery.txt
@@ -18,8 +18,7 @@ Repo:http://quick-settings.googlecode.com/svn/trunk/quick-battery/
 
 Build Version:0.8.2,201010020,153,target=android-8
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:Copter-GCS
-Current Version Code:10
+Current Version:0.8.2
+Current Version Code:201010020
 
diff --git a/metadata/com.dngames.mobilewebcam.txt b/metadata/com.dngames.mobilewebcam.txt
index e9d13f7a37..d0dc132f80 100644
--- a/metadata/com.dngames.mobilewebcam.txt
+++ b/metadata/com.dngames.mobilewebcam.txt
@@ -46,6 +46,6 @@ Build Version:2.95,115,!no source code published
 
 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:2.97
-Current Version Code:117
+Current Version:2.96
+Current Version Code:116
 
diff --git a/metadata/com.eddyspace.networkmonitor.txt b/metadata/com.eddyspace.networkmonitor.txt
index 3fd8ee25a4..8ba2e89ee4 100644
--- a/metadata/com.eddyspace.networkmonitor.txt
+++ b/metadata/com.eddyspace.networkmonitor.txt
@@ -16,8 +16,8 @@ Repo:https://anetmon.svn.sourceforge.net/svnroot/anetmon/
 
 Build Version:0.2-beta,2,17
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:2.17.0.2
-Current Version Code:154
+Current Version:0.2-beta
+Current Version Code:2
+
 
diff --git a/metadata/com.everysoft.autoanswer.txt b/metadata/com.everysoft.autoanswer.txt
index 3ca8c2e1ba..19814d5087 100644
--- a/metadata/com.everysoft.autoanswer.txt
+++ b/metadata/com.everysoft.autoanswer.txt
@@ -19,9 +19,7 @@ Build Version:1.2,3,9,target=android-8
 Build Version:1.4,5,12,target=android-8
 Build Version:1.5,6,17,target=android-8
 
-Auto Update Mode:None
 #not in market; not updated since 2010
 Update Check Mode:Static
-Current Version:3.1.1
-Current Version Code:3110
-
+Current Version:1.5
+Current Version Code:6
diff --git a/metadata/com.gluegadget.hndroid.txt b/metadata/com.gluegadget.hndroid.txt
index e10c430f5f..099ec3d705 100644
--- a/metadata/com.gluegadget.hndroid.txt
+++ b/metadata/com.gluegadget.hndroid.txt
@@ -9,14 +9,12 @@ Description:
 Read and comment to stories posted on news.ycombinator.com
 .
 
-Repo Type:git
 Repo:https://github.com/amir/HNdroid.git
+Repo Type:git
 
 Build Version:0.2.1,3,9d49cb7564,srclibs=ActionBarNW@1a98f283,extlibs=HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
 
-Auto Update Mode:None
 #Author doesn't recognize 0.4 on GP
 Update Check Mode:Static
-Current Version:1.1.1
+Current Version:0.2.1
 Current Version Code:3
-
diff --git a/metadata/com.google.android.maps.mytracks.txt b/metadata/com.google.android.maps.mytracks.txt
index 1a872203cb..e7d06d23ad 100644
--- a/metadata/com.google.android.maps.mytracks.txt
+++ b/metadata/com.google.android.maps.mytracks.txt
@@ -17,8 +17,5 @@ Repo:https://mytracks.googlecode.com/hg/
 Build Version:1.1.0,23,a86a640f2d,subdir=MyTracks
 Build Version:1.1.3,26,!Doesn't build - dependencies and keys
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:3.4
-Current Version Code:3040
 
diff --git a/metadata/com.googlecode.droidwall.txt b/metadata/com.googlecode.droidwall.txt
index 70345aa4ec..397a96d219 100644
--- a/metadata/com.googlecode.droidwall.txt
+++ b/metadata/com.googlecode.droidwall.txt
@@ -34,8 +34,7 @@ Build Version:1.4.8,148,156
 #Build Version:1.5.6,156,245,target=android-8
 Build Version:1.5.7,157,246,target=android-8
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:2.0.0
-Current Version Code:18
+Current Version:1.5.7
+Current Version Code:157
 
diff --git a/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt b/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
index af59eaded8..c75e5a0358 100644
--- a/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
+++ b/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
@@ -27,10 +27,10 @@ Build Version:1.7.4,1070040,ff4138b4f,rm=TtsPlus-FBReader.apk
 Build Version:1.9.3,1090030,9f62b881f,rm=TtsPlus-FBReader.apk
 Build Version:2.0.0,2000000,e26ac107c,target=android-15,rm=TtsPlus-FBReader.apk,\
 prebuild=sed -i -e '/proguard/d' project.properties
-
 # 2.0.1 starts using an amazon appstore lib and code
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.0.2a
-Current Version Code:2000021
+Current Version:2.0.1
+Current Version Code:2000010
 
diff --git a/metadata/com.lecz.android.tiltmazes.txt b/metadata/com.lecz.android.tiltmazes.txt
index f6099ac2fd..acab2ed596 100644
--- a/metadata/com.lecz.android.tiltmazes.txt
+++ b/metadata/com.lecz.android.tiltmazes.txt
@@ -17,9 +17,8 @@ Repo:http://tiltmazes.googlecode.com/svn/trunk
 
 Build Version:1.2,3,!wait for client 51,target=android-4
 
-Auto Update Mode:None
 #Not updated since 02/2009
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:2
+Current Version:1.2
+Current Version Code:3
 
diff --git a/metadata/com.manor.currentwidget.txt b/metadata/com.manor.currentwidget.txt
index 5e92cdef8e..f52189566b 100644
--- a/metadata/com.manor.currentwidget.txt
+++ b/metadata/com.manor.currentwidget.txt
@@ -7,7 +7,6 @@ Donate:http://code.google.com/p/currentwidget/
 
 Summary:Battery current draw widget
 Description:
-No description available
 .
 
 Repo Type:svn
@@ -19,8 +18,8 @@ prebuild=echo "android.library.reference.1=../CurrentWidgetLibrary" >> project.p
 rm -rf ../CurrentWidgetLibrary/bin && mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
 echo "android.library.reference.1=$$Color-Picker$$" >> ../CurrentWidgetLibrary/project.properties 
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.38
-Current Version Code:130301122
+Current Version:0.36b
+Current Version Code:31
+
 
diff --git a/metadata/com.nephoapp.anarxiv.txt b/metadata/com.nephoapp.anarxiv.txt
index 6730695011..0e4f7e0aa5 100644
--- a/metadata/com.nephoapp.anarxiv.txt
+++ b/metadata/com.nephoapp.anarxiv.txt
@@ -14,9 +14,8 @@ Repo:https://github.com/Nephoapp/anarxiv.git
 
 Build Version:1.0,1,1ba2de,target=android-8
 
-Auto Update Mode:None
 #v1.0 not in master; not updated since 02/11
 Update Check Mode:Static
-Current Version:3.0
-Current Version Code:20121130
+Current Version:1.0
+Current Version Code:1
 
diff --git a/metadata/com.noshufou.android.su.txt b/metadata/com.noshufou.android.su.txt
index 0a569416bd..a2f84cab2a 100644
--- a/metadata/com.noshufou.android.su.txt
+++ b/metadata/com.noshufou.android.su.txt
@@ -30,9 +30,8 @@ Build Version:3.0.7,41,!The latest free version but using with recent su could l
 extlibs=android/android-support-v4.jar
 Build Version:3.1.3,46,!blobs in source
 
-Auto Update Mode:None
 #Device variable for some reason
 Update Check Mode:Static
-Current Version:4.4.1
-Current Version Code:49
+Current Version:3.1.3
+Current Version Code:46
 
diff --git a/metadata/com.passwordmaker.txt b/metadata/com.passwordmaker.txt
index 485a98b9e7..fd9eb938ac 100644
--- a/metadata/com.passwordmaker.txt
+++ b/metadata/com.passwordmaker.txt
@@ -3,7 +3,6 @@ Category:Internet
 License:GPLv3
 Web Site:http://www.hansche.de/android/apoma/
 Source Code:http://passwordmaker.hansche.de/passwordmaker/src
-Issue Tracker:
 
 Summary:PasswordMaker for Android
 Description:
@@ -25,9 +24,8 @@ Repo:https://bitbucket.org/Loxley/passwordmaker
 
 Build Version:2.1.5,10,0c4427cfbc7d,target=android-15
 
-Auto Update Mode:None
 #Device variable
 Update Check Mode:Static
-Current Version:5
-Current Version Code:5
+Current Version:2.1.5
+Current Version Code:10
 
diff --git a/metadata/com.roozen.SoundManager.txt b/metadata/com.roozen.SoundManager.txt
index b2815d8d64..dd33488b4e 100644
--- a/metadata/com.roozen.SoundManager.txt
+++ b/metadata/com.roozen.SoundManager.txt
@@ -21,8 +21,7 @@ Repo:http://app-soundmanager.googlecode.com/svn/tags/
 
 Build Version:2.0.0,18,127,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.9.1
-Current Version Code:8120
+Current Version:2.0.0
+Current Version Code:18
 
diff --git a/metadata/com.textuality.lifesaver2.txt b/metadata/com.textuality.lifesaver2.txt
index 36d67a84f2..ec7dafd99a 100644
--- a/metadata/com.textuality.lifesaver2.txt
+++ b/metadata/com.textuality.lifesaver2.txt
@@ -20,9 +20,8 @@ Repo:http://lifesaver.googlecode.com/svn/trunk/
 Build Version:1.0,3,!wait for client at 18,target=android-10,prebuild=rm -rf src/com/textuality/lifesaver
 Build Version:2.1,5,! tokens for app-engine server required,target=android-4
 
-Auto Update Mode:None
 #Probably won't offer a local version again, coming as it does, from a Google employee
 Update Check Mode:Static
 Current Version:1.0
-Current Version Code:10
+Current Version Code:3
 
diff --git a/metadata/com.webworxshop.swallowcatcher.txt b/metadata/com.webworxshop.swallowcatcher.txt
index a56f49e7ee..a80277809c 100644
--- a/metadata/com.webworxshop.swallowcatcher.txt
+++ b/metadata/com.webworxshop.swallowcatcher.txt
@@ -19,8 +19,7 @@ Build Version:0.1.2,5,1528089ae926c6424f9017b46940616cf1164820
 Build Version:0.1.3,6,96660ce659e830f1ac18d4187948a3ac227e2225
 Build Version:0.2.0,7,cb4dd3114342b41ae63fe050628bb4811efa8beb
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.3.0
-Current Version Code:50
+Current Version:0.2.0
+Current Version Code:7
 
diff --git a/metadata/de.kromonos.android.rpcoiner.txt b/metadata/de.kromonos.android.rpcoiner.txt
index f73c26330d..bf27fde394 100644
--- a/metadata/de.kromonos.android.rpcoiner.txt
+++ b/metadata/de.kromonos.android.rpcoiner.txt
@@ -15,9 +15,8 @@ Repo:https://git.gitorious.org/rpcoiner/rpcoiner.git
 
 Build Version:0.1 Alpha,1,8d5930b,subdir=RPCoiner
 
-Auto Update Mode:None
 #version in strings.xml
 Update Check Mode:Static
-Current Version:2.3
-Current Version Code:9
+Current Version:0.1 Alpha
+Current Version Code:1
 
diff --git a/metadata/dentex.youtube.downloader.txt b/metadata/dentex.youtube.downloader.txt
index 0e4fb1926b..0012f0a79b 100644
--- a/metadata/dentex.youtube.downloader.txt
+++ b/metadata/dentex.youtube.downloader.txt
@@ -31,10 +31,9 @@ Build Version:1.7,37,1.7,subdir=dentex.youtube.downloader,update=.;../android-fi
 Build Version:1.8,38,1.8,subdir=dentex.youtube.downloader,update=.;../android-filechooser,prebuild=rm ../*.apk
 Build Version:1.8.1,39,1.8.1,subdir=dentex.youtube.downloader,update=.;../android-filechooser,prebuild=rm ../*.apk
 Build Version:1.8.2,40,1.8.2,subdir=dentex.youtube.downloader,update=.;../android-filechooser,prebuild=rm ../*.apk
-Build Version:1.9,41,1.9,subdir=dentex.youtube.downloader,update=.;../android-filechooser,prebuild=rm ../*.apk
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.9
-Current Version Code:41
+Current Version:1.8.2
+Current Version Code:40
 
diff --git a/metadata/faenza.adw.theme.txt b/metadata/faenza.adw.theme.txt
index 2e8389c205..954d8386b4 100644
--- a/metadata/faenza.adw.theme.txt
+++ b/metadata/faenza.adw.theme.txt
@@ -2,7 +2,6 @@ Category:System
 License:GPLv3
 Web Site:https://code.google.com/p/faenza-adw-theme/
 Source Code:https://code.google.com/p/faenza-adw-theme/source/list
-Issue Tracker:
 
 Summary:ADW theme
 Description:
@@ -14,9 +13,7 @@ Repo:http://faenza-adw-theme.googlecode.com/svn/trunk/
 
 Build Version:1.0,1,1
 
-Auto Update Mode:None
 #Not in market; no revisions since initial import in 03/11
 Update Check Mode:Static
-Current Version:1.1.12
-Current Version Code:214
-
+Current Version:1.0
+Current Version Code:1
diff --git a/metadata/info.guardianproject.gpg.txt b/metadata/info.guardianproject.gpg.txt
index 1a8cafebb0..cfd1a85d80 100644
--- a/metadata/info.guardianproject.gpg.txt
+++ b/metadata/info.guardianproject.gpg.txt
@@ -14,12 +14,10 @@ external/data/data/info.guardianproject.gpg/app_opt/bin/gpg2-static.
 Repo Type:srclib
 Repo:GNUPG
 
-Auto Update Mode:None
 #Dependencies required
 #Build Version:0.0,1,76d62f6064,buildjni=no,submodules=yes,\
 #prebuild=make NDK_BASE=$$NDK$$ -C external/ gnupg-install && make NDK_BASE=$$NDK$$ -C external/ gnupg-static && \
 #make NDK_BASE=$$NDK$$ -C external/ gpgme-install && make NDK_BASE=$$NDK$$ -C external/ android-assets && ndk-build
-Update Check Mode:Static
-Current Version:0.0.2-20110906
-Current Version Code:3
+
+Update Check Mode:Static
 
diff --git a/metadata/info.toyonos.hfr4droid.txt b/metadata/info.toyonos.hfr4droid.txt
index 0ab94bd8b9..094e42aeea 100644
--- a/metadata/info.toyonos.hfr4droid.txt
+++ b/metadata/info.toyonos.hfr4droid.txt
@@ -19,6 +19,4 @@ Build Version:0.7.4,74,263,subdir=hfr4droid,update=.;../hfr4droidCommon
 
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:9
 
diff --git a/metadata/it.devapp.android.txt b/metadata/it.devapp.android.txt
index 4a0fd792a5..a7a96ab27a 100644
--- a/metadata/it.devapp.android.txt
+++ b/metadata/it.devapp.android.txt
@@ -4,7 +4,6 @@ Category:Navigation
 License:GPLv3
 Web Site:http://sourceforge.net/projects/geosearch/
 Source Code:http://sourceforge.net/projects/geosearch/files/source/
-Issue Tracker:
 
 Summary:Monitor the movement of a friend
 Description:
@@ -21,8 +20,5 @@ Repo:git://gitorious.org/source-of-geosearch/code01.git
 
 Build Version:1.0,1,18c0181854baa10,target=Google Inc.:Google APIs:15
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:9
 
diff --git a/metadata/net.pierrox.mcompass.txt b/metadata/net.pierrox.mcompass.txt
index 8941f7fdb6..285ffb3bef 100644
--- a/metadata/net.pierrox.mcompass.txt
+++ b/metadata/net.pierrox.mcompass.txt
@@ -16,8 +16,7 @@ Repo:http://svn.pierrox.net/mcompass/trunk/
 
 Build Version:1.2.4,10,32
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.9.6
-Current Version Code:3
+Current Version:1.2.4
+Current Version Code:10
 
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index 300d95e568..57d07cc3ef 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -64,6 +64,6 @@ build=./scripts/build-ffmpeg.sh,buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:0.5.6
-Current Version Code:71
+Current Version:0.5.5
+Current Version Code:70
 
diff --git a/metadata/org.adw.launcher.txt b/metadata/org.adw.launcher.txt
index 00d26ed09a..a0a4c08575 100644
--- a/metadata/org.adw.launcher.txt
+++ b/metadata/org.adw.launcher.txt
@@ -21,8 +21,7 @@ Repo:https://github.com/AnderWeb/android_packages_apps_Launcher.git
 
 Build Version:1.3.6 Standalone,34,b28e9e417c81857cfd2e0265c3c6d409d6c8d0f1
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:2.0.2
-Current Version Code:14
+Current Version:1.3.6 Standalone
+Current Version Code:34
 
diff --git a/metadata/org.aprsdroid.app.txt b/metadata/org.aprsdroid.app.txt
index 6e54afee3a..4d40220a8b 100644
--- a/metadata/org.aprsdroid.app.txt
+++ b/metadata/org.aprsdroid.app.txt
@@ -15,8 +15,5 @@ Repo:https://github.com/ge0rg/aprsdroid.git
 
 Build Version:1.2.0,10,!contains scala code 6060f53846
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.12.0
-Current Version Code:70
 
diff --git a/metadata/org.beide.droidgain.txt b/metadata/org.beide.droidgain.txt
index 8ae07459bb..12e6262a10 100644
--- a/metadata/org.beide.droidgain.txt
+++ b/metadata/org.beide.droidgain.txt
@@ -16,8 +16,5 @@ Repo:git://github.com/beide/Droidgain.git
 #Disabled build - requires a one line change to the ndk
 Build Version:1.0,1,!needs ndk fix 3cf8be7ebcff4470199c95271537790dc7416063,buildjni=yes
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
 
diff --git a/metadata/org.curiouscreature.android.shelves.txt b/metadata/org.curiouscreature.android.shelves.txt
index 14a4d0e5b5..ca9224a9fb 100644
--- a/metadata/org.curiouscreature.android.shelves.txt
+++ b/metadata/org.curiouscreature.android.shelves.txt
@@ -19,9 +19,6 @@ Repo:http://shelves.googlecode.com/svn/trunk/Shelves
 Build Version:1.0,1,26,oldsdkloc=yes
 Build Version:1.5,2,!No source code apparently
 
-Auto Update Mode:None
 #not in market
 Update Check Mode:Static
-Current Version:1.5
-Current Version Code:20
 
diff --git a/metadata/org.hermit.audalyzer.txt b/metadata/org.hermit.audalyzer.txt
index 58db88b150..12d6bd1e90 100644
--- a/metadata/org.hermit.audalyzer.txt
+++ b/metadata/org.hermit.audalyzer.txt
@@ -11,8 +11,7 @@ A simple audio analyser that displays sound readings from the microphone
 as a waveform display, as a frequency spectrum, and as a dB meter.
 .
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:3.4.4
-Current Version Code:37
+Current Version:1.15
+Current Version Code:16
 
diff --git a/metadata/org.hermit.dazzle.txt b/metadata/org.hermit.dazzle.txt
index 52eef1d801..c8da563956 100644
--- a/metadata/org.hermit.dazzle.txt
+++ b/metadata/org.hermit.dazzle.txt
@@ -13,8 +13,7 @@ from WiFi, Bluetooth, GPS, airplane mode, and brightness controls; on
 supported devices, brightness lets you toggle between auto and manual modes.
 .
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:3.4.4
-Current Version Code:37
+Current Version:2.9
+Current Version Code:12
 
diff --git a/metadata/org.hermit.netscramble.txt b/metadata/org.hermit.netscramble.txt
index 2eda6a0a25..7b8561dff1 100644
--- a/metadata/org.hermit.netscramble.txt
+++ b/metadata/org.hermit.netscramble.txt
@@ -12,8 +12,7 @@ the network randomly rotated and must rotate them to connect all the terminals
 to the server. A port of the KDE game "knetwalk".
 .
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:3.4.4
-Current Version Code:37
+Current Version:5.0.2
+Current Version Code:28
 
diff --git a/metadata/org.hermit.tricorder.txt b/metadata/org.hermit.tricorder.txt
index 9b891e84ff..babfb28cf2 100644
--- a/metadata/org.hermit.tricorder.txt
+++ b/metadata/org.hermit.tricorder.txt
@@ -21,8 +21,7 @@ cp -r  ../HermitLibrary/src/org/hermit/* ../HermitAndroid/src/org/hermit/android
 cp -r  ../HermitLibrary/src/net ../HermitAndroid/src/ && \
 cp -r  ../HermitLibrary/src/ca ../HermitAndroid/src/ 
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:3.4.4
-Current Version Code:37
+Current Version:5.12
+Current Version Code:41
 
diff --git a/metadata/org.jsharkey.sky.txt b/metadata/org.jsharkey.sky.txt
index ef8fc945e7..0247438fcd 100644
--- a/metadata/org.jsharkey.sky.txt
+++ b/metadata/org.jsharkey.sky.txt
@@ -14,9 +14,8 @@ Repo:http://android-sky.googlecode.com/svn/trunk/
 
 Build Version:1.0,1,2,subdir=Sky,prebuild=rm -rf Sky/
 
-Auto Update Mode:None
 #No revisions since 06/2009
 Update Check Mode:Static
-Current Version:0.61
-Current Version Code:8
+Current Version:1.0
+Current Version Code:1
 
diff --git a/metadata/org.kost.externalip.txt b/metadata/org.kost.externalip.txt
index 9a22241d46..f954221491 100644
--- a/metadata/org.kost.externalip.txt
+++ b/metadata/org.kost.externalip.txt
@@ -16,9 +16,8 @@ Build Version:1.2,3,431da48bfb10,target=android-8
 Build Version:1.2-change_server,4,431da48bfb10,target=android-8,patch=change_server.patch,\
 forceversion=yes,forcevercode=yes
 
-Auto Update Mode:None
 #No revisions in a long time
 Update Check Mode:Static
-Current Version:2.2.5
-Current Version Code:21
+Current Version:1.2-change_server
+Current Version Code:4
 
diff --git a/metadata/org.kreed.vanilla.txt b/metadata/org.kreed.vanilla.txt
index 1dfb8dc34e..2685290564 100644
--- a/metadata/org.kreed.vanilla.txt
+++ b/metadata/org.kreed.vanilla.txt
@@ -23,8 +23,7 @@ Build Version:0.1,16,4169dd05b3ac321555bb8436fd2a90f93e52b49d
 Build Version:0.9.9,99,0.9.9,prebuild=rm -rf releases
 Build Version:0.9.10,910,0.9.10,prebuild=rm -rf releases
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:2.2.5
-Current Version Code:21
+Current Version:0.9.10
+Current Version Code:910
 
diff --git a/metadata/org.mailboxer.saymyname.txt b/metadata/org.mailboxer.saymyname.txt
index 252bdd3146..b6f9614773 100644
--- a/metadata/org.mailboxer.saymyname.txt
+++ b/metadata/org.mailboxer.saymyname.txt
@@ -12,9 +12,6 @@ SayMyName reads out loud the name saved in your address book and tells you
 who's calling. Also works with incoming SMS and email via K-9 Mail.
 .
 
-Auto Update Mode:None
 #now abandoned in favour of a rewrite, Announcify that has other kinds or non free bits
 Update Check Mode:Static
-Current Version:0.0.4
-Current Version Code:4
 
diff --git a/metadata/org.moparisthebest.appbak.txt b/metadata/org.moparisthebest.appbak.txt
index f2a70feba0..deb817aa8c 100644
--- a/metadata/org.moparisthebest.appbak.txt
+++ b/metadata/org.moparisthebest.appbak.txt
@@ -19,8 +19,7 @@ looking to restore apps after a wipe try keeping that enabled. The apps can then
 restored using a file manager like [[org.openintents.filemanager]].
 .
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.9.2
-Current Version Code:26
+Current Version:1.0
+Current Version Code:2
 
diff --git a/metadata/org.mrpdaemon.android.encdroid.txt b/metadata/org.mrpdaemon.android.encdroid.txt
index e986743656..c040ae7624 100644
--- a/metadata/org.mrpdaemon.android.encdroid.txt
+++ b/metadata/org.mrpdaemon.android.encdroid.txt
@@ -19,6 +19,6 @@ prebuild=mvn package -f $$EncfsJava$$/pom.xml && cp $$EncfsJava$$/target/encfs-j
 
 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:1.5
-Current Version Code:9
+Current Version:1.4
+Current Version Code:8
 
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index c67806e686..eddcd0e93e 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -30,6 +30,4 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DCACHE_SIZE="(20
 
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:2.0.1
-Current Version Code:4
 
diff --git a/metadata/org.opensatnav.android.txt b/metadata/org.opensatnav.android.txt
index 2b3b4d4ecf..f0db45e117 100644
--- a/metadata/org.opensatnav.android.txt
+++ b/metadata/org.opensatnav.android.txt
@@ -16,9 +16,7 @@ Repo:lp:opensatnav
 
 Build Version:1.0,199,199,target=android-7,prebuild=mv lib libs
 
-Auto Update Mode:None
 #not in the market
 Update Check Mode:Static
-Current Version:2.0.2
-Current Version Code:27
-
+Current Version:1.0
+Current Version Code:199
diff --git a/metadata/org.servalproject.maps.txt b/metadata/org.servalproject.maps.txt
index a50d5f81cf..82a975a430 100644
--- a/metadata/org.servalproject.maps.txt
+++ b/metadata/org.servalproject.maps.txt
@@ -21,8 +21,5 @@ Repo:https://github.com/servalproject/ServalMaps.git
 
 Build Version:0.3.1,2,!not ready for release by a long way v0.3.1
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.5.0
-Current Version Code:12
 
diff --git a/metadata/org.swiftp.txt b/metadata/org.swiftp.txt
index 7ef8f6f1f6..46251c1ac7 100644
--- a/metadata/org.swiftp.txt
+++ b/metadata/org.swiftp.txt
@@ -16,11 +16,10 @@ seems to have stopped developing it but it should still work fine.
 Repo Type:svn
 Repo:http://swiftp.googlecode.com/svn/trunk/
 
-Auto Update Mode:None
 #Not in market
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
+Current Version:1.24
+Current Version Code:17
 
 #Can't build this version - see http://code.google.com/p/swiftp/issues/detail?id=128
 #Build Version:1.24,17,69,target=android-3
diff --git a/metadata/org.tof.txt b/metadata/org.tof.txt
index 1b14e08243..1c1c1c616d 100644
--- a/metadata/org.tof.txt
+++ b/metadata/org.tof.txt
@@ -17,9 +17,8 @@ Build Version:1.0.5 (Droid),17,22,fixtrans=yes,prebuild=mkdir -p libs/armeabi &&
 mv libs_/* libs/armeabi && rm -rf libs_/ && \
 sed -i 's/\(app_name\">Taps Of Fire\)[^<]*/\1/' res/values/strings.xml
 
-Auto Update Mode:None
 #Last revision in 06/2010
 Update Check Mode:Static
-Current Version:1.7
-Current Version Code:9
+Current Version:1.0.5 (Droid)
+Current Version Code:17
 
diff --git a/metadata/org.waxworlds.edam.importcontacts.txt b/metadata/org.waxworlds.edam.importcontacts.txt
index 161a2db572..241e8db0e1 100644
--- a/metadata/org.waxworlds.edam.importcontacts.txt
+++ b/metadata/org.waxworlds.edam.importcontacts.txt
@@ -15,8 +15,7 @@ Repo:http://bzr.ed.am/android/import-contacts
 
 Build Version:1.1,2,27
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.9.5.6
-Current Version Code:983
+Current Version:1.1
+Current Version Code:2
 
diff --git a/metadata/org.witness.informacam.txt b/metadata/org.witness.informacam.txt
index 2a64473832..b43c34f423 100644
--- a/metadata/org.witness.informacam.txt
+++ b/metadata/org.witness.informacam.txt
@@ -41,8 +41,5 @@ git submodule init && git submodule update && \
 sed -i 's/make -j4/make -j2/g' external/Makefile && \
 make -C external && $$NDK$$/ndk-build,buildjni=yes
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.0.1
-Current Version Code:1
 
diff --git a/metadata/ru.qrck.quitetaskmanager.txt b/metadata/ru.qrck.quitetaskmanager.txt
index b37f3a5ab6..cd4c136bf7 100644
--- a/metadata/ru.qrck.quitetaskmanager.txt
+++ b/metadata/ru.qrck.quitetaskmanager.txt
@@ -15,9 +15,7 @@ Repo:http://quitetaskmanager.googlecode.com/svn/trunk/
 
 Build Version:1.2,2,14
 
-Auto Update Mode:None
 #not in market
 Update Check Mode:Static
-Current Version:1.6.3
-Current Version Code:81
-
+Current Version:1.2
+Current Version Code:2
diff --git a/metadata/se.chalmers.doit.txt b/metadata/se.chalmers.doit.txt
index 1265ecdde5..1997f8bbd5 100644
--- a/metadata/se.chalmers.doit.txt
+++ b/metadata/se.chalmers.doit.txt
@@ -15,8 +15,7 @@ Repo:http://dat255-doit.googlecode.com/svn/trunk/
 
 Build Version:1.0,1,110,subdir=doIT,target=android-10,prebuild=rm -rf ./doIT.apk
 
-Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.10
-Current Version Code:10
+Current Version:1.0
+Current Version Code:1
 
diff --git a/metadata/uk.co.busydoingnothing.prevo.txt b/metadata/uk.co.busydoingnothing.prevo.txt
index 063d6ef811..a265e88171 100644
--- a/metadata/uk.co.busydoingnothing.prevo.txt
+++ b/metadata/uk.co.busydoingnothing.prevo.txt
@@ -2,7 +2,6 @@ Category:Science & Education
 License:GPLv2
 Web Site:http://www.busydoingnothing.co.uk/prevo/
 Source Code:http://git.busydoingnothing.co.uk/cgit.cgi/prevo-android.git/
-Issue Tracker:
 
 Summary:Esperanto dictionary
 Description:
@@ -16,9 +15,6 @@ Repo:git://git.busydoingnothing.co.uk/prevo-android.git
 
 Build Version:0.3,3,!Needs a lot of work 5bbaab6852978e,target=android-14
 
-Auto Update Mode:None
 #Tags/Repo can't find version info and no reviews on market
 Update Check Mode:Static
-Current Version:2.01
-Current Version Code:101