diff --git a/metadata/android.game.prboom.txt b/metadata/android.game.prboom.txt
index 91940b8b04..f89717feaa 100644
--- a/metadata/android.game.prboom.txt
+++ b/metadata/android.game.prboom.txt
@@ -24,3 +24,8 @@ Repo Type:git-svn
 Repo:http://prboom4android.googlecode.com/svn/trunk/
 
 Build Version:1.3.1-beta,31,49,buildjni=yes
+
+#not in market
+Update Check Mode:None
+Current Version:1.3.1-beta
+Current Version Code:31
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index 741a3c4751..135b03cd54 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -3,6 +3,7 @@ License:GPLv2
 Web Site:http://www.keepassdroid.com/
 Source Code:http://github.com/bpellin/keepassdroid
 Issue Tracker:http://code.google.com/p/keepassdroid/issues/list
+Donate:http://www.keepassdroid.com/
 
 Summary:KeePass-compatible password safe
 Description:
diff --git a/metadata/com.everysoft.autoanswer.txt b/metadata/com.everysoft.autoanswer.txt
index c1acab4034..9755061ee3 100644
--- a/metadata/com.everysoft.autoanswer.txt
+++ b/metadata/com.everysoft.autoanswer.txt
@@ -18,3 +18,8 @@ Build Version:1.1,2,5,target=android-8
 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
+
+#not in market
+Update Check Mode:None
+Current Version:1.5
+Current Version:6
diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index bbb9055bc2..42c15cbfbd 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -8,6 +8,8 @@ Summary:Full-featured email client
 Description:
 Email client supporting multiple accounts, POP3, IMAP, Push IMAP. Packed with
 features and highly configurable.
+
+If you want to contribute financially, please make a donation to the local SPCA
 .
 
 Repo Type:git
@@ -15,7 +17,7 @@ Repo:https://github.com/k9mail/k-9.git
 
 #Note - k9 is currently developer's binary only
 #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10
-Update Check Mode:Market
-Current Version:4.011
-Current Version Code:14029
+Update Check Mode:None
+Current Version:4.301
+Current Version Code:17001
 
diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt
index 365975a0b5..2153171646 100644
--- a/metadata/com.github.mobile.txt
+++ b/metadata/com.github.mobile.txt
@@ -27,3 +27,8 @@ Repo:https://github.com/github/android.git
 
 Build Version:1.1,600,1.1,maven=yes,bindir=app/target
 
+#AM.xml in subdir=app
+Update Check Mode:Market
+Current Version:1.1
+Current Version Code:600
+
diff --git a/metadata/com.google.android.apps.authenticator2.txt b/metadata/com.google.android.apps.authenticator2.txt
index ff21619d15..3021c23977 100644
--- a/metadata/com.google.android.apps.authenticator2.txt
+++ b/metadata/com.google.android.apps.authenticator2.txt
@@ -17,3 +17,8 @@ Repo Type:git
 Repo:https://code.google.com/p/google-authenticator.android/
 
 Build Version:2.21,21,b762c8e1ad84,target=android-15
+
+Update Check Mode:RepoManifest
+Current Version:2.21
+Current Version Code:21
+
diff --git a/metadata/com.googlecode.talkmyphone.txt b/metadata/com.googlecode.talkmyphone.txt
index 0dadcd27a6..f1a2d478f2 100644
--- a/metadata/com.googlecode.talkmyphone.txt
+++ b/metadata/com.googlecode.talkmyphone.txt
@@ -9,9 +9,11 @@ Description:
 Allows you to send commands to your device remotely, via the XMPP protocol.
 You can also receive information, such as incoming calls and SMS, and
 battery state.
+
+N.B. This project has been abandoned in favour of GTalkSMS but we don't have that in the repo because the source contains nonfree libraries.
 .
 
-Update Check Mode:Market
+Update Check Mode:None
 Current Version:2.06-beta
 Current Version Code:17
 
diff --git a/metadata/com.gs.mobileprint.txt b/metadata/com.gs.mobileprint.txt
index effdf1b0b9..a88c944c10 100644
--- a/metadata/com.gs.mobileprint.txt
+++ b/metadata/com.gs.mobileprint.txt
@@ -12,3 +12,8 @@ Repo Type:svn
 Repo:https://mobileprint.svn.sourceforge.net/svnroot/mobileprint
 
 Build Version:0.5,1,1
+
+#not in market
+Update Check Mode:None
+Current Version:0.5
+Current Version Code:1
diff --git a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
index 0d47e05183..1765b45a4e 100644
--- a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
+++ b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
@@ -12,5 +12,6 @@ This app allows you to add remote streaming functionality to Just-Player using A
 Repo Type:git
 Repo:https://bitbucket.org/yokmama/just-player-providers.git
 
-#Build problems
-#Build Version:1.19,410044,1370e4cfe884,subdir=AmpacheProvider
+Build Version:1.19,410044,1370e4cfe884,subdir=AmpacheProvider
+
+Update Check Mode:Market
diff --git a/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt b/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
index 32ba90ad81..5da8a8b776 100644
--- a/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
+++ b/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
@@ -13,5 +13,6 @@ You can search for podcasts and subscribe to podcast urls in this app. Then choo
 Repo Type:git
 Repo:https://bitbucket.org/yokmama/just-player-providers.git
 
-#Build problems
-#Build Version:1.1a,1010008,1370e4cfe884,subdir=PodcastProvider
+Build Version:1.1a,1010008,1370e4cfe884,subdir=PodcastProvider
+
+Update Check Mode:Market
diff --git a/metadata/kdk.android.simplydo.txt b/metadata/kdk.android.simplydo.txt
index fbed1669ec..ccc7ec5301 100644
--- a/metadata/kdk.android.simplydo.txt
+++ b/metadata/kdk.android.simplydo.txt
@@ -13,3 +13,9 @@ Repo Type:git-svn
 Repo:http://simply-do.googlecode.com/svn/trunk/
 
 Build Version:0.9.1,1,18,subdir=simply-do-app
+
+#not in market,yet
+Update Check Mode:None
+Current Version:1.9.1
+Current Version Code:1
+
diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt
index b476b5aeb6..c82c3e3d9b 100644
--- a/metadata/org.mozilla.firefox.txt
+++ b/metadata/org.mozilla.firefox.txt
@@ -1,13 +1,16 @@
 Category:Internet
-License:MPL
-Web Site:http://www.firefox.com
+#mostly...
+License:MPL2
+#also links to ftp site 
+Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
 Source Code:http://hg.mozilla.org/
-Issue Tracker:
+Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android
 
-Summary:Firefox Mobile web browser
+Summary:Web browser
 Description:
-Mozilla Firefox Mobile web browser.  Uses the Gecko layout engine to render
-web pages, which implements current and anticipated web standards.
+Mobile version of the Mozilla Firefox Mobile web browser.  Uses the Gecko layout engine to render web pages, which implements current and anticipated web standards. Features include bookmark sync and custom search engines. Since v13 the interface has been changed to speed things up, but any old addons will not work. Please see the website for the list of supported devices. 
+
+Warning: the issue tracker link is not mobile-friendly.
 .
 
 #Binaries in repo for now, build process is large and complex. They are very
diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt
index 54124f130a..ac4cf88619 100644
--- a/metadata/org.mozilla.firefox_beta.txt
+++ b/metadata/org.mozilla.firefox_beta.txt
@@ -1,12 +1,18 @@
 Category:Internet
-License:MPL
-Web Site:http://www.firefox.com
+#mostly...
+License:MPL2
+#this links to ftp site too
+Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
 Source Code:http://hg.mozilla.org/
-Issue Tracker:
+Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android
 
-Summary:Firefox Mobile Beta web browser
+Summary:Next version of the web browser
 Description:
-Beta version of Firefox Mobile web browser.
+N.B each version has several betas but only one of them is here. See the website for a link to the ftp site. 
+
+Mobile version of the Mozilla Firefox Mobile web browser.  Uses the Gecko layout engine to render web pages, which implements current and anticipated web standards. Features include bookmark sync and custom search engines. Since v13 the interface has been changed to speed things up, but any old addons will not work. Please see the website for the list of supported devices. 
+
+Warning: the issue tracker link is not mobile-friendly.
 .
 
 #Binaries in repo for now, build process is large and complex. They are very
diff --git a/metadata/triqita.obsqr.txt b/metadata/triqita.obsqr.txt
index 750109583a..e77c74d239 100644
--- a/metadata/triqita.obsqr.txt
+++ b/metadata/triqita.obsqr.txt
@@ -16,3 +16,5 @@ Repo:https://bitbucket.org/trikita/obsqr
 
 #Native code doesn't build for some reason
 #Build Version:2.4,9,071341595ce3,target=android-15,buildjni=yes
+
+Update Check Mode:Market