diff --git a/metadata/com.adam.aslfms.txt b/metadata/com.adam.aslfms.txt
index 4196357d63..9035dc9ce5 100644
--- a/metadata/com.adam.aslfms.txt
+++ b/metadata/com.adam.aslfms.txt
@@ -6,12 +6,17 @@ Issue Tracker:https://github.com/tgwizard/sls/issues
 
 Summary:Last.fm/Libre.fm Scrobbler
 Description:
-Scrobbling means submitting listening information to Last.fm and/or Libre.fm; you can then get music 
-recommendations and view your listening history and statistics. The media player that you use must be able 
-to work with the API e.g. [[org.kreed.vanilla]] or [[jp.co.kayo.android.localplayer]]. 
-Apps can also hook into the Now-Playing broadcast: for example, [[com.jlyr]] can use it to grab lyrics.
+Scrobbling means submitting listening information to Last.fm and/or Libre.fm; 
+you can then get music 
+recommendations and view your listening history and statistics. 
+The media player that you use must be able 
+to work with the API e.g. [[org.kreed.vanilla]] or 
+[[jp.co.kayo.android.localplayer]]. 
+Apps can also hook into the Now-Playing broadcast: for example, [[com.jlyr]] 
+can use it to grab lyrics.
 
-More info about scrobbling can be found on [http://www.last.fm/help/faq?category=Scrobbling#201 Last.fm's FAQ].
+More info about scrobbling can be found on 
+[http://www.last.fm/help/faq?category=Scrobbling#201 Last.fm's FAQ].
 .
 
 Repo Type:git
@@ -21,8 +26,7 @@ Build Version:1.4.3,30,v1.4.3,rm=other/RhapsodyAndroidPreview.apk
 Build Version:1.4.4,31,v1.4.4,rm=other/RhapsodyAndroidPreview.apk
 
 Auto Update Mode:None
-#Tags don't work: wrong branch
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:1.4.5
 Current Version Code:32
 
diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt
index 4112a5903a..d5456c5113 100644
--- a/metadata/com.github.mobile.txt
+++ b/metadata/com.github.mobile.txt
@@ -30,7 +30,7 @@ Build Version:1.5,1100,1.5,maven=yes,bindir=app/target
 Build Version:1.6.1,1300,1.6.1,maven=yes,bindir=app/target
 
 Auto Update Mode:Version %v
-#Tags can't find Manifest
+#Manifest isn't in root dir
 Update Check Mode:Market
 Current Version:1.6.1
 Current Version Code:1300
diff --git a/metadata/com.google.android.marvin.talkback.txt b/metadata/com.google.android.marvin.talkback.txt
new file mode 100644
index 0000000000..c057a20ff0
--- /dev/null
+++ b/metadata/com.google.android.marvin.talkback.txt
@@ -0,0 +1,51 @@
+Category:System
+License:Apache2
+Web Site:http://code.google.com/p/eyes-free
+Source Code:http://code.google.com/p/eyes-free/source/list
+Issue Tracker:http://code.google.com/p/eyes-free/issues/list
+
+Summary:Accessibility improvements
+Description:
+TalkBack is an Accessibility Service that helps blind and vision-impaired 
+users interact with their devices more easily.
+This application adds spoken, audible, and vibration feedback to your device. 
+It comes pre-installed on many devices
+(but not in CyanogenMod), so you won't be able to install this if that is
+the case.
+
+It's only activated if you explicitly turn on Accessibility:
+# Go to Settings
+# Select Accessibility
+# (Android 3.2 and earlier) Enable Accessibility checkbox
+# Enable TalkBack checkboxes
+# (Android 4.0 and later) Enable explore-by-touch
+
+See the 
+[http://eyes-free.googlecode.com/svn/trunk/documentation/android_access/index.html FAQ] 
+or
+the [http://eyes-free.blogspot.com Eyes-Free blog] for more on Android accessibility.
+.
+
+Repo Type:srclib
+Repo:EyesFree
+
+Build Version:3.1.1_r68,68,r787,novcheck=yes,subdir=accessibilityServices/talkback,\
+update=.;../../libraries/utils;../../libraries/compatutils,\
+prebuild=sed -i 's@\(android.library.reference.1=\).*@\1../../libraries/utils@' project.properties && \
+sed -i 's@\(android.library.reference.2=\).*@\1../../libraries/compatutils@' project.properties && \
+cd ../../ && rm -rf apps archived braille devtools documentation eSpeakEngine \
+ideal ime ocr samplecode thirdparty tts
+
+Build Version:3.2.1,83,r798,novcheck=yes,subdir=accessibilityServices/talkback,\
+update=.;../../libraries/utils;../../libraries/compatutils;../../libraries/widgets/radial_menu,\
+prebuild=sed -i 's@\(android.library.reference.1=\).*@\1../../libraries/utils@' project.properties && \
+sed -i 's@\(android.library.reference.2=\).*@\1../../libraries/compatutils@' project.properties && \
+sed -i 's@\(android.library.reference.3=\).*@\1../../libraries/widgets/radial_menu@' project.properties && \
+cd ../../ && rm -rf apps archived braille devtools documentation eSpeakEngine \
+ideal ime ocr samplecode thirdparty tts
+
+#Device-variable
+Update Check Mode:None
+Current Version:3.2.1
+Current Version Code:83
+
diff --git a/metadata/com.google.marvin.shell.txt b/metadata/com.google.marvin.shell.txt
index 0a642d0ea8..0d8cdf40bc 100644
--- a/metadata/com.google.marvin.shell.txt
+++ b/metadata/com.google.marvin.shell.txt
@@ -23,12 +23,12 @@ Repo Type:srclib
 Repo:EyesFree
 
 #Not sure if this is the right revision
-Build Version:3.0.4,33,!unknown build server problems r787,subdir=apps/shell,\
+Build Version:3.0.4,33,!build server rejection r787,subdir=apps/shell,\
 update=.;../../libraries/utils;../../libraries/compatutils,target=android-15,\
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1../../libraries/utils@' project.properties && \
 echo "android.library.reference.2=../../libraries/compatutils" >> project.properties && \
-rm -f ../../documentation/TextToSpeech_Plugin_Engine_Examples/PicoUnbundled/bin/PicoUnbundled.apk \
-      ../../documentation/TextToSpeech_Plugin_Engine_Examples/eSpeakEngine/bin/eSpeakEngine.apk
+cd ../../ && rm -rf accessibilityServices archived braille devtools documentation eSpeakEngine \
+ideal ime ocr samplecode thirdparty tts
 
 Build Version:3.1.0,35,!no source at time of inspection
 
diff --git a/metadata/com.menny.android.anysoftkeyboard.txt b/metadata/com.menny.android.anysoftkeyboard.txt
index d2b8c0cd76..949f6255bc 100644
--- a/metadata/com.menny.android.anysoftkeyboard.txt
+++ b/metadata/com.menny.android.anysoftkeyboard.txt
@@ -21,7 +21,7 @@ Description:
 There are many language packs and themes available as apks on the website.
 We will try and publish any that have source xml and attribution/licence for the
 dictionaries. For more info see the f-droid.org 
-http://f-droid.org/forums/topic/anysoftkeyboard-language-packs-layouts-plans/#post-6408 forum topic].
+[http://f-droid.org/forums/topic/anysoftkeyboard-language-packs-layouts-plans/#post-6408 forum topic].
 .
 
 Repo Type:git
diff --git a/metadata/com.nolanlawson.chordreader.txt b/metadata/com.nolanlawson.chordreader.txt
index 77e81ab127..cd0c7a6ce6 100644
--- a/metadata/com.nolanlawson.chordreader.txt
+++ b/metadata/com.nolanlawson.chordreader.txt
@@ -21,8 +21,7 @@ Repo:https://github.com/nolanlawson/ChordReaderRoot.git
 
 Build Version:1.0.1,8,v1.0.1,subdir=ChordReader
 
-#Tags can't find AM.xml
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:1.0.1
 Current Version Code:8
 
diff --git a/metadata/com.scottmain.android.searchlight.txt b/metadata/com.scottmain.android.searchlight.txt
index 4313310c03..b2551c05bc 100644
--- a/metadata/com.scottmain.android.searchlight.txt
+++ b/metadata/com.scottmain.android.searchlight.txt
@@ -7,6 +7,9 @@ Issue Tracker:http://code.google.com/p/search-light/issues/list
 Summary:LED Flashlight
 Description:
 Uses your camera's LED as a flashlight/torch.
+
+Try [[org.bc_bd.mrwhite]] if your device doesn't 
+have a camera/flashlight.
 .
 
 Repo Type:git-svn
diff --git a/metadata/com.tunes.viewer.txt b/metadata/com.tunes.viewer.txt
index f31ff614fb..b9db2254c6 100644
--- a/metadata/com.tunes.viewer.txt
+++ b/metadata/com.tunes.viewer.txt
@@ -20,10 +20,10 @@ Repo Type:hg
 Repo:https://bitbucket.org/LBryan/tunesviewer-android
 
 Build Version:1.1,14,125
-Build Version:1.2,15,!build errors 130
+Build Version:1.2.1,16,134
 
 #Not on Market: see http://sourceforge.net/projects/tunesviewer/files/Android
 Update Check Mode:None
-Current Version:1.2
-Current Version Code:15
+Current Version:1.2.1
+Current Version Code:16
 
diff --git a/metadata/jackpal.androidterm.txt b/metadata/jackpal.androidterm.txt
index 38a136b31f..309116589b 100644
--- a/metadata/jackpal.androidterm.txt
+++ b/metadata/jackpal.androidterm.txt
@@ -7,6 +7,10 @@ Issue Tracker:https://github.com/jackpal/Android-Terminal-Emulator/issues
 Summary:Terminal Emulator
 Description:
 VT-100 compatible terminal emulator.
+
+[[org.pocketworkstation.pckeyboard]], 
+[[com.anysoftkeyboard.languagepack.SSH]] and the Android 
+PC-keyboard-layout in Android 4.1 are well suited to terminal work.
 .
 
 Repo Type:git
diff --git a/metadata/kr.hybdms.sidepanel.txt b/metadata/kr.hybdms.sidepanel.txt
index 182a5b5020..e41d3631ea 100644
--- a/metadata/kr.hybdms.sidepanel.txt
+++ b/metadata/kr.hybdms.sidepanel.txt
@@ -17,9 +17,8 @@ This app is in beta stage; it is not intended for daily use just yet.
 Repo Type:git
 Repo:git://github.com/sukso96100/SidePanel.git
 
-Build Version:0.8(beta),10,!wip 7662a6d3743,target=android-17,subdir=SidePanel,prebuild=\
-rm -rf bin gen ../SignedAPKs && cd ../abs && rm -rf bin gen && $$MVN3$$ clean package \
--Dandroid.sdk.path=$$SDK$$ -Dandroid.sign.debug=false && android update project -p .
+Build Version:0.8(beta),10,7662a6d3743,subdir=SidePanel,init=\
+rm -rf bin gen ../SignedAPKs ../abs/bin ../abs/gen,update=.;../abs
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/net.everythingandroid.smspopup.txt b/metadata/net.everythingandroid.smspopup.txt
index cbcf088812..f144ed8b2b 100644
--- a/metadata/net.everythingandroid.smspopup.txt
+++ b/metadata/net.everythingandroid.smspopup.txt
@@ -23,7 +23,7 @@ srclibs=ViewPagerIndicator@65457eac06,\
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ViewPagerIndicator$$@' project.properties 
 
 #Device variable and Tags doesn't work
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:1.2.4
 Current Version Code:124
 
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index fb0d5d72c2..57d07cc3ef 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -58,8 +58,9 @@ sed -i 's/bash/sh/g' arm-build.sh && \
 sed -i '/PIPESTATUS/d' arm-build.sh && \
 NDK=$$NDK$$ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg,buildjni=yes
 Build Version:0.5.5,70,!build server rejection 1361,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && ./scripts/build-ffmpeg.sh && \
-echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties,buildjni=yes
+rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && \
+echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties,\
+build=./scripts/build-ffmpeg.sh,buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:Market
diff --git a/metadata/org.connectbot.txt b/metadata/org.connectbot.txt
index 886c7992d2..4cb62031ef 100644
--- a/metadata/org.connectbot.txt
+++ b/metadata/org.connectbot.txt
@@ -8,6 +8,10 @@ Summary:SSH and local shell client
 Description:
 An SSH and telnet client, and terminal emulator for local shell.
 Supports multiple sessions, including running them concurrently.
+
+[[org.pocketworkstation.pckeyboard]], 
+[[com.anysoftkeyboard.languagepack.SSH]] and the Android 
+PC-keyboard-layout in Android 4.1 are well suited to terminal work.
 .
 
 Repo Type:git
diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index a590408284..6f0148cb90 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -25,13 +25,16 @@ Repo:git://git.linphone.org/linphone-android.git
 
 Build Version:2.0.3-fdroid,2003,!syntax error on build server 2.0.3-1,submodules=no,update=no,\
 init=git submodule update --init --recursive,prebuild=rm -rf tests && \
-rm -f submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
+rm -f submodules/externals/webrtc/modules/\
+video_capture/main/source/android/java/org/webrtc/videoengine/* && \
 export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$ && \
 sed -i 's@\$(NDK_PATH)@$$NDK$$@g' Makefile && \
-make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 BUILD_FOR_X86=1 update-project prepare-sources && \
 echo "version.name=2.0.3-fdroid" > default.properties && \
 sed -i 's/debuggable ="true"/debuggable="false"/g' AndroidManifest.xml && \
-sed -i 's/markets\">true/markets\">=false/g' res/values/non_localizable_custom.xml,buildjni=no
+sed -i 's/markets\">true/markets\">=false/g' \
+res/values/non_localizable_custom.xml,build=\
+make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 \
+BUILD_FOR_X86=1 update-project prepare-sources,buildjni=no
 
 Auto Update Mode:None
 #Tags would nuke all the submodules
diff --git a/metadata/org.mult.daap.txt b/metadata/org.mult.daap.txt
index 2002b175e0..9f28fc9215 100644
--- a/metadata/org.mult.daap.txt
+++ b/metadata/org.mult.daap.txt
@@ -18,7 +18,7 @@ Build Version:.9.2,31,!Repo code is missing at least one file update - the manif
 Build Version:.9.6.2,38,!No corresponding source in repo
 Build Version:.9.6.5,39,89
 Build Version:.9.7,40,90
-Build Version:.9.7,45,!Published elsewhere with different version code but no corresponding source
+Build Version:.9.7+,45,107,forceversion=yes,target=android-8
 
 Auto Update Mode:None
 Update Check Mode:Market
diff --git a/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt b/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
index 5e5c2943ed..3375b736cd 100644
--- a/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
+++ b/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
@@ -22,8 +22,7 @@ Build Version:0.6.10,47,v0.6.10,subdir=variant/dnt,update=.;../..,prebuild=mkdir
 Build Version:0.6.11,48,v0.6.11,subdir=variant/dnt,update=.;../..,prebuild=mkdir -p src
 
 Auto Update Mode:None
-#Tags nukes repo?!
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:0.6.11
 Current Version Code:48
 
diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index d5dc6adb63..eae60c3399 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -18,20 +18,20 @@ Repo:git://git.videolan.org/vlc-ports/android.git
 
 Build Version:0.0.11-ARMv7,110,0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
 update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=cd ../ && sed -i '48d' Makefile && \
+prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
 ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
 
 Build Version:0.0.11-ARM,111,!0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
 update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=cd ../ && sed -i '48d' Makefile && \
+prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
 ANDROID_ABI=armeabi ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
 Build Version:0.0.11-x86,112,!0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
 update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=cd ../ && sed -i '48d' Makefile && \
+prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
 ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
 Build Version:0.0.11-mips,113,!0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
 update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=cd ../ && sed -i '48d' Makefile && \
+prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
 ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
 
 Auto Update Mode:None
diff --git a/metadata/org.wheelmap.android.online.txt b/metadata/org.wheelmap.android.online.txt
index b9a265a18b..afadbc8312 100644
--- a/metadata/org.wheelmap.android.online.txt
+++ b/metadata/org.wheelmap.android.online.txt
@@ -33,8 +33,7 @@ echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
 #srclibs=HoloEverywhere@holoeverywhere-1.2.2;PullToRefresh@v1.4.0;ActionBarSherlock@4.1.0
 
 Auto Update Mode:None
-#Tags and RM don't see AM.xml
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:0.8.3
 Current Version Code:16
 
diff --git a/metadata/org.woltage.irssiconnectbot.txt b/metadata/org.woltage.irssiconnectbot.txt
index a7003e74a5..7fdaeb22f3 100644
--- a/metadata/org.woltage.irssiconnectbot.txt
+++ b/metadata/org.woltage.irssiconnectbot.txt
@@ -8,9 +8,13 @@ Bitcoin:1EJt1d7MKUg71hyNr8WcDKvmswcraZjKQm
 
 Summary:Specialised SSH Client
 Description:
-Irssi ConnectBot is a modified version of the popular ConnectBot SSH client for
+Irssi ConnectBot is a modified version of [[org.connectbot]] SSH client for
 Android. Irssi ConnectBot has features which helps users to use IRC-clients and
-other utilites through SSH.
+other utilities through SSH.
+
+[[org.pocketworkstation.pckeyboard]], 
+[[com.anysoftkeyboard.languagepack.SSH]] and the Android 
+PC-keyboard-layout in Android 4.1 are well suited to terminal work.
 .
 
 Repo Type:git
diff --git a/metadata/sk.vx.connectbot.txt b/metadata/sk.vx.connectbot.txt
index daa51f727d..3ebc5d272c 100644
--- a/metadata/sk.vx.connectbot.txt
+++ b/metadata/sk.vx.connectbot.txt
@@ -7,13 +7,19 @@ Donate:http://connectbot.vx.sk/
 
 Summary:SSH (remote access) client
 Description:
-Based on Connectbot, an android ssh client as well as other projects.
-Feature enhancements: background file transfer (SCP protocol;character picker 
-dialog (on-screen button and hardware SYM key); single line input (on-screen 
-button), tap and hold menu (switch to fullscreen mode, change font size); save 
-SSH keys as files; save console screenshots (PNG format); new key mappings 
-(hardware keyboard); lots of bugfixes; additional customizations for some phones
-with hardware keyboards
+Based on [[org.connectbot]] and other projects. Additional features:
+* background file transfer (SCP protocol)
+* character picker dialog (on-screen button and hardware SYM key)
+* single line input (on-screen button)
+* tap and hold menu (switch to fullscreen mode, change font size)
+* save SSH keys as files
+* save console screenshots (PNG format)
+* new key mappings (hardware keyboard)
+* additional customizations for some phones with hardware keyboards
+
+[[org.pocketworkstation.pckeyboard]], 
+[[com.anysoftkeyboard.languagepack.SSH]] and the Android 
+PC-keyboard-layout in Android 4.1 are well suited to terminal work.
 .
 
 Repo Type:git