diff --git a/metadata/au.com.darkside.XServer.txt b/metadata/au.com.darkside.XServer.txt
index 8a9fd489f3..c620ba710d 100644
--- a/metadata/au.com.darkside.XServer.txt
+++ b/metadata/au.com.darkside.XServer.txt
@@ -6,9 +6,9 @@ Issue Tracker:http://code.google.com/p/android-xserver/issues/list
 
 Summary:Run X11 applications on your device
 Description:
-X Server, allowing you to run [http://en.wikipedia.org/wiki/X_Window_System X11] applications 
+X Server, allowing you to display [http://en.wikipedia.org/wiki/X_Window_System X11] applications 
 on your device. It could be used in conjunction with [[info.guardianproject.lildebi]] to 
-run graphical apps according to the instructions on
+use graphical apps according to the instructions on
 [http://j05hyyy.blogspot.com/2012_09_01_archive.html this blog].
 .
 
@@ -20,6 +20,7 @@ Build Version:1.09,9,26105231ccb8,subdir=XServer
 Build Version:1.10,10,91d1a1cd52d6,subdir=XServer
 Build Version:1.11,11,f3a6f53541c3,subdir=XServer
 Build Version:1.12,12,3df512591de2,subdir=XServer
+Build Version:1.13,13,9b3adb042a42,subdir=XServer
 
 Auto Update Mode:None
 Update Check Mode:Market
diff --git a/metadata/be.ppareit.swiftp_free.txt b/metadata/be.ppareit.swiftp_free.txt
index f88b681357..e827c6d141 100644
--- a/metadata/be.ppareit.swiftp_free.txt
+++ b/metadata/be.ppareit.swiftp_free.txt
@@ -8,9 +8,10 @@ Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZBVL
 Name:FTP Server
 Summary:Access your phone wirelessly
 Description:
-This can actually work over the internet but the most likely usage is to access files from another 
-computer without needing a cable. This is a fork of [[org.swiftp]] which is no longer being
-developed. The name Demo in the launcher just means that it corresponds to the free version on
+This app can work over the internet but the most likely usage is to access files from another 
+computer without needing a cable. 
+
+The name Demo in the launcher just means that it corresponds to the free version on
 Google. The app is fully featured so instead of buying the "Full" version as a way of contributing
 you can donate via the Paypal link.
 .
diff --git a/metadata/com.eddyspace.networkmonitor.txt b/metadata/com.eddyspace.networkmonitor.txt
index 56954cef27..7e7f0af0c7 100644
--- a/metadata/com.eddyspace.networkmonitor.txt
+++ b/metadata/com.eddyspace.networkmonitor.txt
@@ -1,3 +1,4 @@
+Disabled:Beta that isn't being maintained and don't work on Android 4
 Category:System
 License:GPLv3+
 Web Site:http://anetmon.sourceforge.net/
diff --git a/metadata/com.gcstar.scanner.txt b/metadata/com.gcstar.scanner.txt
index b888241966..cdc11fac87 100644
--- a/metadata/com.gcstar.scanner.txt
+++ b/metadata/com.gcstar.scanner.txt
@@ -7,7 +7,12 @@ Donate:http://gcstar.org/contribute.en.php#donate
 
 Summary:Scan items for your collections
 Description:
-GCstar is a cross-platform application for managing your collections. Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to. You may also search and filter your collection by many criteria. 
+You will need [[com.google.zxing.client.android]] to be installed.
+
+GCstar is a cross-platform application for managing your collections. Detailed 
+information on each item can be automatically retrieved from the internet and 
+you can store additional data, such as the location or who you've lent it to. 
+You may also search and filter your collection by many criteria. 
 .
 
 Repo Type:git-svn
diff --git a/metadata/com.google.zxing.client.android.txt b/metadata/com.google.zxing.client.android.txt
index 089cd10c63..5e919bfc0f 100644
--- a/metadata/com.google.zxing.client.android.txt
+++ b/metadata/com.google.zxing.client.android.txt
@@ -24,7 +24,7 @@ Supports:
 * Aztec ('beta' quality) 
 * PDF 417 ('alpha' quality)
 
-Anti-feature: NonFreeAdd. It suggests the Google Shopper app to look up product barcodes and asks 
+Anti-feature: Add-ons. It suggests the Google Shopper app to look up product barcodes and asks 
 you to download Barcode Scanner + from the settings: both of which are non-free apps. In addition
 (though this is not one of our anti-features), all web and product searches are hard-coded to google.com.
 .
diff --git a/metadata/com.nolanlawson.apptracker.txt b/metadata/com.nolanlawson.apptracker.txt
index 2e5051e2a3..62ce0e8423 100644
--- a/metadata/com.nolanlawson.apptracker.txt
+++ b/metadata/com.nolanlawson.apptracker.txt
@@ -3,7 +3,7 @@ License:WTFPL
 Web Site:https://github.com/nolanlawson/AppTracker
 Source Code:https://github.com/nolanlawson/AppTracker
 Issue Tracker:https://github.com/nolanlawson/AppTracker/issues
-Donation:http://nolanlawson.com/donation
+Donate:http://nolanlawson.com/donation
 
 Summary:Track your app usage
 Description:
@@ -11,7 +11,8 @@ App Tracker is a productivity app that keeps track of other apps you’ve used,
 statistics about them (most used, seldom used, recently used, etc.). You can then display this information 
 in a widget or in the app itself, and launch them easily.
 
-Uses Logcat to figure out what apps have been launched.
+Uses logcat to figure out what apps have been launched, which means it may not work on
+Android 4.1+.
 .
 
 Repo Type:git
diff --git a/metadata/com.nononsenseapps.notepad.txt b/metadata/com.nononsenseapps.notepad.txt
index 00ddcbbb95..edab1ad9fa 100644
--- a/metadata/com.nononsenseapps.notepad.txt
+++ b/metadata/com.nononsenseapps.notepad.txt
@@ -4,21 +4,24 @@ Web Site:https://github.com/spacecowboy/NotePad
 Source Code:https://github.com/spacecowboy/NotePad
 Issue Tracker:https://github.com/spacecowboy/NotePad/issues
 
-Name:Notes
+Name:NoNonsenseNotes
 Summary:Simple notepad
 Description:
-Notepad and todo list app with a modern look
+N.B. The syncing with Google Tasks won't work because there are
+no API keys in the source code.
+
+Notepad and todo list app with a modern look.
 .
 
 Repo Type:git
 Repo:https://github.com/spacecowboy/NotePad.git
 
-#impossible to find the right commit
 Build Version:3.5.4,34,80dbfc,target=android-15
+Build Version:3.6,36,3.6-release,init=rm -f build.xml custom_rules.xml,prebuild=\
+rm -f *.zip *.png *.7z *.psd 
 
 Auto Update Mode:None
-#RepoManifest gets wrong version, as it's bumped during development, not on release.
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:3.6
 Current Version Code:36
 
diff --git a/metadata/com.totsp.bookworm.txt b/metadata/com.totsp.bookworm.txt
index e5a4f6c060..169f221ba9 100644
--- a/metadata/com.totsp.bookworm.txt
+++ b/metadata/com.totsp.bookworm.txt
@@ -6,9 +6,11 @@ Issue Tracker:http://code.google.com/p/and-bookworm/issues/list
 
 Summary:Book collection manager
 Description:
+
 BookWorm allows you to keep track of books you have read and those you
-intend to read. You can enter books by scanning them (product codes),
-searching for them, or direct form entry. You can rate and comment on each
+intend to read. You can enter books by scanning them 
+(if you have [[com.google.zxing.client.android]] installed),
+searching for them, or by direct form entry. You can rate and comment on each
 book. Once you have your book list, you can sort and filter it.
 .
 
diff --git a/metadata/net.cyclestreets.txt b/metadata/net.cyclestreets.txt
index baddefd879..a44ec5a199 100644
--- a/metadata/net.cyclestreets.txt
+++ b/metadata/net.cyclestreets.txt
@@ -3,7 +3,7 @@ License:GPLv3
 Web Site:http://www.cyclestreets.net/blog/category/android
 Source Code:https://github.com/cyclestreets/android
 Issue Tracker:https://github.com/cyclestreets/android/issues
-Donation:http://www.cyclestreets.net/donate
+Donate:http://www.cyclestreets.net/donate
 
 Summary:UK cycling navigation
 Description:
diff --git a/metadata/net.oschina.app.txt b/metadata/net.oschina.app.txt
new file mode 100644
index 0000000000..ae864a0d13
--- /dev/null
+++ b/metadata/net.oschina.app.txt
@@ -0,0 +1,22 @@
+Category:Reading
+License:GPL
+Web Site:http://www.oschina.net/p/oschina-android-app
+Source Code:https://github.com/oschina/android-app
+Issue Tracker:https://github.com/oschina/android-app/issues
+
+Summary:Chinese-language FOSS news
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/oschina/android-app.git
+
+Build Version:1.7.3,17,v1.7.3
+
+Auto Update Mode:None
+#Use tags for betas
+Update Check Mode:Tags
+Current Version:1.7.3
+Current Version Code:17
+
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 0d741a9187..3e9121220e 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -1,3 +1,4 @@
+Disabled:Outdated apk and can't be built
 Category:Navigation
 License:GPLv2
 Web Site:http://www.navit-project.org
@@ -11,11 +12,9 @@ support for various vector map formats. This is a beta version which may not
 work very well!
 .
 
-Repo Type:git-svn
-Repo:https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit
-
+##compile: http://wiki.navit-project.org/index.php/Navit_on_Android#Compiling 
 ## apks at http://download.navit-project.org/navit/android/svn/ and http://download.navit-project.org/navit/android_armv4t/svn/
-## don't know where to find version and version code
+
 Update Check Mode:Market
 Current Version:navit
 Current Version Code:5197
diff --git a/metadata/org.petero.droidfish.txt b/metadata/org.petero.droidfish.txt
index 1d6b4177e9..58bfdf4eb7 100644
--- a/metadata/org.petero.droidfish.txt
+++ b/metadata/org.petero.droidfish.txt
@@ -6,8 +6,6 @@ Issue Tracker:http://code.google.com/p/cuckoochess/issues/list
 
 Summary:Chess program
 Description:
-Our build now works, Stockfish engine and all.
-
 Port of the CuckooChess applet/engine. 
 
 If you have [[org.scid.android]] installed you can read Scid database files directly from the
diff --git a/metadata/org.zakky.memopad.txt b/metadata/org.zakky.memopad.txt
index 8292a0e887..b2c2d3efe8 100644
--- a/metadata/org.zakky.memopad.txt
+++ b/metadata/org.zakky.memopad.txt
@@ -6,10 +6,8 @@ Issue Tracker:https://github.com/zaki50/MemoPad/issues
 
 Summary:Free-hand drawing
 Description:
-Dual canvases. Variable line width, canvas and pen colours. 
-
-This app as been in the repo for a while with a different icon. But we used a version that
-wasn't supposed to have been released, hence the downgrade.
+Simple drawing app with dual canvases, variable line width, 
+canvas and pen colours. 
 .
 
 Repo Type:git
diff --git a/metadata/sk.madzik.android.logcatudp.txt b/metadata/sk.madzik.android.logcatudp.txt
index b05f09767a..00db3cf88f 100644
--- a/metadata/sk.madzik.android.logcatudp.txt
+++ b/metadata/sk.madzik.android.logcatudp.txt
@@ -6,6 +6,8 @@ Issue Tracker:http://code.google.com/p/logcatudp/issues/list
 
 Summary:Wireless logging
 Description:
+N.B. This probably won't work on Android 4.1+.
+
 Simple tool for android development that sends a log to UDP port or share it via email, bluetooth, etc.
 Background service is collecting logs and sending them to destination IP and UDP port. You can send logs to desktop computer through home wifi network, or to server with public IP or cname.
 
diff --git a/metadata/sk.vx.connectbot.txt b/metadata/sk.vx.connectbot.txt
index cd088f4283..733ef8e7a1 100644
--- a/metadata/sk.vx.connectbot.txt
+++ b/metadata/sk.vx.connectbot.txt
@@ -3,7 +3,7 @@ License:Apache2
 Web Site:http://connectbot.vx.sk/
 Source Code:https://github.com/vx/connectbot
 Issue Tracker:https://github.com/vx/connectbot/issues
-Donation:http://connectbot.vx.sk/
+Donate:http://connectbot.vx.sk/
 
 Summary:SSH (remote access) client
 Description: