diff --git a/metadata/at.aichbauer.ical.txt b/metadata/at.aichbauer.ical.txt
deleted file mode 100644
index ae7936357f..0000000000
--- a/metadata/at.aichbauer.ical.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Disabled:Development stopped
-Category:Office
-License:GPLv3
-Web Site:https://code.google.com/p/ical-import-export/
-Source Code:https://code.google.com/p/ical-import-export/source/checkout
-Issue Tracker:https://code.google.com/p/ical-import-export/issues/list
-
-Summary:iCal (.ics) file importer
-Description:
-Allows you to import iCalendar files to your calendar without using Google
-synchronization services.
-.
-
-Repo Type:git-svn
-Repo:http://ical-import-export.googlecode.com/svn/trunk/
-
-Build Version:1.5,51,!errors 11,subdir=iCalImportExport,\
-target=android-7,update=.;../AndroidTools,prebuild=\
-mv lib libs && echo "android.library.reference.1=../AndroidTools" > project.properties,\
-rm=AndroidTools/bin/AndroidTools.apk
-
-Update Check Mode:None
-Current Version:1.5
-Current Version Code:51
-
diff --git a/metadata/cm.aptoide.pt.txt b/metadata/cm.aptoide.pt.txt
index de6b1fe186..48b3606d15 100644
--- a/metadata/cm.aptoide.pt.txt
+++ b/metadata/cm.aptoide.pt.txt
@@ -1,6 +1,5 @@
-Disabled:Admob
 Category:System
-License:GPLv2+
+License:GPL
 Web Site:http://www.aptoide.com/
 Source Code:http://aptoide.org/trac
 Issue Tracker:http://aptoide.org/trac
@@ -14,11 +13,8 @@ based on Aptoide!
 Repo Type:git-svn
 Repo:http://aptoide.org/repo/aptoide-client
 
-#n.b subdir needs to change with version; directories created *after* revision
-Build Version:2.7.0,324,!ad-related errors at 817,subdir=2.7.0/Aptoide,update=.;../com_viewpagerindicator,\
+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 
 
-#not in market
 Update Check Mode:None
-Current Version:2.7.1
-Current Version Code:326
+
diff --git a/metadata/com.androidemu.snes.txt b/metadata/com.androidemu.snes.txt
index 37678d4829..56615a70c7 100644
--- a/metadata/com.androidemu.snes.txt
+++ b/metadata/com.androidemu.snes.txt
@@ -1,4 +1,3 @@
-Disabled:Non-Commercial License
 Category:Games
 Web Site:https://github.com/Pretz/SNesoid/
 Source Code:https://github.com/Pretz/SNesoid
@@ -11,8 +10,8 @@ Description:
 Repo Type:git
 Repo:https://github.com/Pretz/SNesoid.git
 
-Build Version:2.1,68,a9381085e0,subdir=SNesoid,buildjni=yes,prebuild=cd .. && git submodule init && \
-git submodule update && cd SNesoid
+Build Version:2.1,68,!non-commercial licence a9381085e0,subdir=SNesoid,\
+prebuild=cd .. && git submodule init && git submodule update,buildjni=yes 
 
 Update Check Mode:None
 Current Version:2.1
diff --git a/metadata/com.blogspot.marioboehmer.nfcprofile.txt b/metadata/com.blogspot.marioboehmer.nfcprofile.txt
index 1e1ae244f1..586525f6fd 100644
--- a/metadata/com.blogspot.marioboehmer.nfcprofile.txt
+++ b/metadata/com.blogspot.marioboehmer.nfcprofile.txt
@@ -1,4 +1,3 @@
-Disabled:Not a free software license
 Category:System
 License:CCBYNCSA3
 Web Site:http://marioboehmer.blogspot.com/2012/03/nfc-profile-version-21.html
@@ -7,13 +6,14 @@ Issue Tracker:https://github.com/MarioBoehmer/NFCProfile/issues
 
 Summary:Perform actions using tags
 Description:
-Start alarms, turn on/off radios and ringers, and launch apps by tapping your phone against an NFC tag
+Start alarms, turn on/off radios and ringers, and launch apps by tapping your 
+phone against an NFC tag.
 .
 
 Repo Type:git
 Repo:https://github.com/MarioBoehmer/NFCProfile.git
 
-Build Version:2.2,5,1292aa
+Build Version:2.2,5,!non-commercial licence 1292aa
 
 Update Check Mode:RepoManifest
 Current Version:2.2
diff --git a/metadata/com.botbrew.basil.txt b/metadata/com.botbrew.basil.txt
index e5a05bd757..219886733f 100644
--- a/metadata/com.botbrew.basil.txt
+++ b/metadata/com.botbrew.basil.txt
@@ -1,4 +1,3 @@
-Disabled:Needs more time
 Category:Development
 License:GPL
 Web Site:http://botbrew.com
@@ -7,23 +6,26 @@ Issue Tracker:https://github.com/jyio/botbrew-gui/issues
 
 Summary:Alternative package management
 Description:
-This is Botbrew Basil and uses dpkg, compared to Botbrew Anise which uses opkg. Botbrew Basil is
-still in the experimental stages. This project compiles various *nix tools and makes packages suitable 
+This is Botbrew Basil and uses dpkg, compared to Botbrew Anise which uses 
+opkg. Botbrew Basil is
+still in the experimental stages. This project compiles various *nix tools and 
+makes packages suitable 
 for installation on ARM devices. The app downloads binaries from botbrew.com.
 .
 
 Repo Type:git
 Repo:https://github.com/jyio/botbrew-gui.git
 
-Build Version:0.0.1.23,23,32698170dd,buildjni=no,target=android-15,extlibs=acra/acra-4.2.3.jar,\
+Build Version:0.0.1.23,23,!works but maybe not ready for popular consumption 32698170dd,\
+target=android-15,extlibs=acra/acra-4.2.3.jar,\
 srclibs=ActionBarSherlock@4.0.1;ViewPagerIndicator@2.2.3;EmulatorView@v1.0.43,\
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
 sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
 sed -i 's@\(android.library.reference.3=\).*@\1$$EmulatorView$$@' project.properties && \
-sed -i 's@~/android-ndk-r8@$$NDK$$@g' mkjni.sh && ./mkjni.sh 
+sed -i 's@~/android-ndk-r8@$$NDK$$@g' mkjni.sh && ./mkjni.sh,buildjni=no 
 
-Build Version:0.0.1.24,24,!can't find apk 733293d904,buildjni=no,maven=yes,prebuild=\
-./external.sh && sed -i 's@~/android-ndk-r8b@$$NDK$$@g' mkjni.sh && ./mkjni.sh 
+Build Version:0.0.1.24,24,!can't find apk 733293d904,maven=yes,prebuild=\
+./external.sh && sed -i 's@~/android-ndk-r8b@$$NDK$$@g' mkjni.sh && ./mkjni.sh,buildjni=no 
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.codebutler.farebot.txt b/metadata/com.codebutler.farebot.txt
index 5bec9d87a1..7a9d287b3c 100644
--- a/metadata/com.codebutler.farebot.txt
+++ b/metadata/com.codebutler.farebot.txt
@@ -1,4 +1,3 @@
-Disabled:Google Maps shenanigans. May also require NFC to even launch
 Category:Navigation
 License:GPLv3
 Web Site:http://codebutler.github.com/farebot
@@ -13,7 +12,7 @@ Read data from MIFARE public transit cards using your NFC-equipped Android phone
 Repo Type:git
 Repo:https://github.com/codebutler/farebot
 
-Build Version:2.3.0,16,0f8fbd02f6,update=.;libs/ActionBarSherlock,target=Google Inc.:Google APIs:15,\
+Build Version:2.3.0,16,!Google Maps dependencies and missing keys 0f8fbd02f6,update=.;libs/ActionBarSherlock,target=Google Inc.:Google APIs:15,\
 prebuild=echo "android.library.reference.1=libs/ActionBarSherlock" >> project.properties
 
 Auto Update Mode:None
diff --git a/metadata/com.determinato.feeddroid.txt b/metadata/com.determinato.feeddroid.txt
deleted file mode 100644
index e07b2b847d..0000000000
--- a/metadata/com.determinato.feeddroid.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#feeddroid project is gone so this fork can use name etc.
-Disabled:app needs some tlc
-Category:Internet
-License:GPLv3
-Web Site:http://gitorious.org/feeddroid/feeddroid
-Source Code:http://gitorious.org/feeddroid/feeddroid
-Issue Tracker:
-
-Summary:RSS feed reader/podcatcher
-Description:
-An RSS feed reader and podcatcher with audio and video support.
-.
-
-Repo Type:git
-Repo:http://git.gitorious.org/feeddroid/feeddroid.git
-
-Build Version:1.1.1,37,db5077bf1ef792d8d5f6154198b7200a50d963df,subdir=FeedDroid
-
-#not in market
-Update Check Mode:None
-Current Version:1.1.1
-Current Version Code:37
-
diff --git a/metadata/com.example.weightchart.txt b/metadata/com.example.weightchart.txt
deleted file mode 100644
index 43e8365d74..0000000000
--- a/metadata/com.example.weightchart.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Disabled: Doesn't build at the moment.
-Category:Office
-License:GPLv3
-Web Site:https://launchpad.net/weightchart
-Source Code:https://code.launchpad.net/~rheo/weightchart/trunk
-Issue Tracker:https://bugs.launchpad.net/weightchart
-
-Summary:Logs your body weight
-Description:
-Keep a personal log of body weight and display as a chart.
-
-.
-
-Repo Type:bzr
-Repo:lp:weightchart
-
-Build Version:1,1,1,target=8
-
-Update Check Mode:None
-
diff --git a/metadata/com.github.andlyticsproject.txt b/metadata/com.github.andlyticsproject.txt
index 54acba2beb..57c63d937f 100644
--- a/metadata/com.github.andlyticsproject.txt
+++ b/metadata/com.github.andlyticsproject.txt
@@ -1,4 +1,3 @@
-Disabled:Pointless to have it here
 Category:Development
 License:Apache2
 Web Site:https://github.com/brunomendola/andlytics/
@@ -7,15 +6,16 @@ Issue Tracker:https://github.com/brunomendola/andlytics/issues
 
 Summary:Track your apps on Play Store
 Description:
-View stats and reply to comments. Requires a google account on the phone but not an admob account
+View stats and reply to comments. Requires a google account on the phone but 
+not an admob account.
 .
 
 Repo Type:git
 Repo:https://github.com/brunomendola/andlytics.git
 
-Build Version:2.2.1,215,0e91055e0d,bindir=build
+Build Version:2.2.1,215,!not for general use 0e91055e0d,bindir=build
 
-Update Check Mode:RepoManifest
+Update Check Mode:None
 Current Version:2.2.1
 Current Version Code:215
 
diff --git a/metadata/com.google.android.maps.mytracks.txt b/metadata/com.google.android.maps.mytracks.txt
index a955d7768f..519862df83 100644
--- a/metadata/com.google.android.maps.mytracks.txt
+++ b/metadata/com.google.android.maps.mytracks.txt
@@ -1,4 +1,3 @@
-Disabled:Needs google maps API key, and some build problems resolving
 AntiFeatures:NonFreeDep
 Category:Navigation
 License:Apache2
@@ -9,21 +8,13 @@ Issue Tracker:http://code.google.com/p/mytracks/issues/list
 Summary:A GPS logger.
 Description:
 MyTracks is a GPS logger.
-
-N.B It isn't possible to view the photos on a map because Google Maps is the only map source and
-f-droid can't supply an API key to use it.	
 .
 
 Repo Type:hg
 Repo:https://mytracks.googlecode.com/hg/
 
 Build Version:1.1.0,23,a86a640f2d,subdir=MyTracks
-Build Version:1.1.3,26,!Doesn't build - needs dependencies building now I think
+Build Version:1.1.3,26,!Doesn't build - dependencies and keys
 
 Update Check Mode:None
-#Build Version:1.1.3,26,62821d45032d,subdir=MyTracks,target=android-10,encoding=utf-8
-#Still doesn't build...
-#Build Version:1.1.9,22,v1.1.9,subdir=MyTracks,encoding=utf-8,target=android-13
-Current Version:2.0
-Current Version Code:48
 
diff --git a/metadata/com.googlecode.android_scripting.txt b/metadata/com.googlecode.android_scripting.txt
index 4d1f8ded37..6395ec6d36 100644
--- a/metadata/com.googlecode.android_scripting.txt
+++ b/metadata/com.googlecode.android_scripting.txt
@@ -1,4 +1,3 @@
-Disabled:Build problems
 Category:Development
 License:Apache2
 Web Site:http://code.google.com/p/android-scripting
@@ -14,7 +13,7 @@ Repo Type:srclib
 Repo:SL4A:android
 
 #Dexclass loaders and build errors; wiki says import all the projects but I think these should do
-Build Version:6,600,46da9687be62,buildjni=yes,subdir=ScriptingLayerForAndroid,update=.;../QuickAction,\
+Build Version:6,600,!build problems 46da9687be62,subdir=ScriptingLayerForAndroid,update=.;../QuickAction,\
 srclibs=NoAnalytics@158a4a,prebuild=\
 echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties && \
 rm -f ../Common/libs/libGoogleAnalytics.jar libs/libGoogleAnalytics.jar \
@@ -22,5 +21,5 @@ rm -f ../Common/libs/libGoogleAnalytics.jar libs/libGoogleAnalytics.jar \
 cp -r ../Common/src/* src/ && cp ../Common/libs/* libs/ && \
 cp -r ../BluetoothFacade/src/* src/ && cp -r ../InterpreterForAndroid/src/* src/ && \
 cp -r ../SignalStrengthFacade/src/* src/ && cp -r ../TextToSpeechFacade/src/* src/ && \
-cp -r ../Utils/src/* src/ && cp -r ../WebCamFacade/src/* src/ 
+cp -r ../Utils/src/* src/ && cp -r ../WebCamFacade/src/* src/,buildjni=yes
 
diff --git a/metadata/com.martynhaigh.violin.txt b/metadata/com.martynhaigh.violin.txt
deleted file mode 100644
index 3244cac5dd..0000000000
--- a/metadata/com.martynhaigh.violin.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Disabled:See license
-Category:Games
-License:Unknown
-Web Site:http://github.com/martynhaigh/Tiny-Open-Source-Violin
-Source Code:http://github.com/martynhaigh/Tiny-Open-Source-Violin
-Issue Tracker:http://github.com/martynhaigh/Tiny-Open-Source-Violin
-
-Summary:A tiny open source violin
-Description:
-The world's tiniest open source violin.
-.
-
-Update Check Mode:Market
-Current Version:1.3
-Current Version Code:9
-
diff --git a/metadata/com.marv42.ebt.newnote.txt b/metadata/com.marv42.ebt.newnote.txt
deleted file mode 100644
index 9e0b14d4f4..0000000000
--- a/metadata/com.marv42.ebt.newnote.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Disabled:Incomplete source?
-Category:Games
-License:GPLv3
-Web Site:http://www.eurobilltracker.com/
-Source Code:http://code.google.com/p/ebt-new-note/source/checkout
-Issue Tracker:http://code.google.com/p/ebt-new-note/issues/list
-Donate:
-
-Summary:Submit Euro bill notes to Euro Bill Tracker
-Description:
-*This software is still under development.*
-Features:
-* Submit note information in the background
-* Note data representation: provide editing, show note in browser
-* Get postal code, country and city from location information (GPS or Network Location), prefer location information depending on accuracy and up-to-dateness
-* Provide an EBT keyboard: no switching between numbers and letters necessary
-* OCR of serial number (experimental)
-* Location based comment suggestions
-.
-
-Repo Type:git-svn
-Repo:http://ebt-new-note.googlecode.com/svn
-
-# [javac] PictureUploader.java:48: cannot find symbol
-# [javac] symbol  : variable Keys
-# [javac] location: class com.marv42.ebt.newnote.scanning.PictureUploader
-# [javac]                                       Keys.WSV_SHORT_TERM_STORAGE);
-Build Version:0.0.64,1,131,subdir=trunk/EbtNewNote,target=android-15,prebuild=mv lib/ libs/
-
-Update Check Mode:None
diff --git a/metadata/com.ninetwozero.battlelog.txt b/metadata/com.ninetwozero.battlelog.txt
deleted file mode 100644
index 3d86400b92..0000000000
--- a/metadata/com.ninetwozero.battlelog.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Disabled:I'm not sure this is legit. See blog post on Web Site
-Category:Games
-License:GPLv3
-Web Site:http://ninetwozero.com
-Source Code:https://github.com/ninetwozero/BF3-Battlelog
-Issue Tracker:https://github.com/ninetwozero/BF3-Battlelog/issues
-
-Summary:A Battlefield 3 battlelog
-Description:
-No description available
-.
-
-Repo Type:git
-Repo:https://github.com/ninetwozero/BF3-Battlelog.git
-
-Build Version:1.0.9,12,c532259
-
-Update Check Mode:RepoManifest
-Current Version:1.0.9
-Current Version Code:12
-
diff --git a/metadata/com.noshufou.android.su.txt b/metadata/com.noshufou.android.su.txt
index bcd0091cf2..052b3ecdec 100644
--- a/metadata/com.noshufou.android.su.txt
+++ b/metadata/com.noshufou.android.su.txt
@@ -1,4 +1,3 @@
-Disabled:Pondering the wisdom of combining old app with new su
 Category:System
 License:Apache2
 Web Site:http://androidsu.com/superuser
@@ -23,7 +22,7 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/ChainsDD/Superuser.git
 
-Build Version:3.0.7,41,912db6e5c08713c0,target=android-11,\
+Build Version:3.0.7,41,!The latest free version but using with recent su could lead to problems 912db6e5c08713c0,target=android-11,\
 extlibs=android/android-support-v4.jar
 Build Version:3.1.3,46,!blobs in source
 
diff --git a/metadata/com.prey.txt b/metadata/com.prey.txt
deleted file mode 100644
index 26d8c18ba4..0000000000
--- a/metadata/com.prey.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Disabled:Google Analytics, possible issues around GCM
-#NonFreeDep because it requires the Market app to be installed, for  using GCM
-AntiFeatures:NonFreeNet,NonFreeDep
-Category:System
-License:GPLv3
-Web Site:http://preyproject.com
-Source Code:https://github.com/prey/prey-android-client/
-Issue Tracker:https://github.com/prey/prey-android-client/issues
-
-Summary:Anti-theft software
-Description:
-Track down your lost or stolen phone or tablet.
-Prey lets you keep track of all your devices easily on one place. Supports:
-- GPS + Wifi geo-location.
-- SIM change detection.
-- SMS or Push (On Demand) activation (2.2+).
-- Lock phone/tablet for privacy (2.2+).
-- Uninstall protection (2.2+).
-- Loud alarm sound.
-- Alert messages to user.
-.
-
-Repo Type:git
-Repo:https://github.com/prey/prey-android-client
-
-# TODO: GCM (aka "push API") seems to require an API key from Google, see http://code.google.com/android/c2dm/index.html
-Build Version:0.5,34,8934cda82af81580a26cf4de233da15feaab1dfd,prebuild=echo "ask-for-password=true\nprey-minor-version=0\nprey-versionon=0.5\nprey-subdomain=control\nprey-domain=preyproject.com\n#c2dm\nc2dm-mail=\nc2dm-action=\nc2dm-message-sync=" > res/raw/config
-
-Auto Update Mode:None
-Update Check Mode:Market
-Current Version:0.5.6
-Current Version Code:41
-
diff --git a/metadata/com.updater.ota.txt b/metadata/com.updater.ota.txt
deleted file mode 100644
index d662e6f5b5..0000000000
--- a/metadata/com.updater.ota.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Disabled:Doesn't work standalone
-Category:System
-License:Apache2
-Web Site:https://www.otaupdatecenter.pro/
-Source Code:https://github.com/OTAUpdateCenter/ota-update-centre
-Issue Tracker:https://github.com/OTAUpdateCenter/ota-update-centre/issues
-Donate:http://forum.xda-developers.com/donatetome.php?u=2393541
-
-Summary:OTA Update Center
-Description:
-Check for updates on boot of devices.
-Check for updates manually when the person wants to.
-Add and remove OTA Updates in a centralised database.
-Download the rom and flash it directly.
-Download the rom without flashing.
-Wipe data and or cache/dalvik before flashing the update.
-.
-
-Repo Type:git
-Repo:https://github.com/OTAUpdateCenter/ota-update-centre.git
-
-Build Version:0.99-RC7,6,c25731e7ded85c0e31ae49e136f2f2e18d86ab37,target=android-16
-
-Update Check Mode:None
-
diff --git a/metadata/com.ushahidi.android.app.txt b/metadata/com.ushahidi.android.app.txt
index c8751346af..b46ee5043b 100644
--- a/metadata/com.ushahidi.android.app.txt
+++ b/metadata/com.ushahidi.android.app.txt
@@ -1,4 +1,3 @@
-Disabled:Requires both non-Free Google Maps and release API keys
 Category:Navigation
 License:LGPL
 Web Site:https://github.com/ushahidi/Ushahidi_Android/
@@ -7,22 +6,30 @@ Issue Tracker:
 
 Summary:Mapping tools
 Description:
-Ushahidi is a web and mobile platform that allows you to create, visualize and share stories on a map. 
-It allows individuals to share their stories on their own terms using the tools they already have. 
-Sync with any Ushahidi deployment. Send reports with images and location data as well as receive 
+Ushahidi is a web and mobile platform that allows you to create, visualize and 
+share stories on a map. 
+It allows individuals to share their stories on their own terms using the tools 
+they already have. 
+Sync with any Ushahidi deployment. Send reports with images and location data 
+as well as receive 
 alerts from others who have sent in reports to the site.
 
-The app supports loading of multiple deployments at one time, quick filtering through reports, 
-exploring incident locations on the map, viewing report photos, news article, media as well as 
-sharing reports via email, SMS or Twitter. Once the data has been downloaded, the app can function 
-without an internet connection, allowing accurate collection of data utilizing the device’s camera 
+The app supports loading of multiple deployments at one time, quick filtering 
+through reports, 
+exploring incident locations on the map, viewing report photos, news article, 
+media as well as 
+sharing reports via email, SMS or Twitter. Once the data has been downloaded, 
+the app can function 
+without an internet connection, allowing accurate collection of data utilizing 
+the device’s camera 
 and GPS capabilities
 .
 
 Repo Type:git
 Repo:https://github.com/ushahidi/Ushahidi_Android.git
 
-Build Version:3.0.3,28,v3.0.3,subdir=Themes/Ushahidi,update=no,prebuild=\
+Build Version:3.0.3,28,!Requires both Google Maps and release API keys v3.0.3,\
+subdir=Themes/Ushahidi,update=no,prebuild=\
 mkdir src && \
 cp ../../Core/libs/* libs/ && rm -f libs/action* && \
 $$SDK/tools/android update project -p ../../Libraries/abs -s && \
@@ -31,6 +38,5 @@ $$SDK/tools/android update project -p ../../Libraries/cwacmerge -s && \
 $$SDK/tools/android update project -p ../../Core -s && \
 $$SDK/tools/android update project -p . -s -t "Google Inc.:Google APIs:15" 
 
-
 Update Check Mode:None
 
diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt
deleted file mode 100644
index c0a272b7f1..0000000000
--- a/metadata/com.zoffcc.applications.zanavi.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Disabled:Tough to build
-Category:Navigation
-License:GPLv2
-Web Site:http://zanavi.cc/index.php/Main_Page
-Source Code:http://viewsvn1.zanavi.cc/viewvc.cgi/zanavi_public1/navit/
-Issue Tracker:http://trac.zanavi.cc/
-
-Summary:Offline Navigation
-Description:
-Based on Navit, Zanavi aims to be an easy to use offline navigator
-Features include:
-*) works on Ice Cream Sandwich (ICS) (Android 4)
-*) support to show GPX files
-*) Navigate to target from google maps
-*) APP2SD
-*) works offline (offline navigation)
-*) world overview map
-*) tunnels are visible on map
-*) bridges visible on map
-*) map turns with compass
-*) map management (download/update/delete maps)
-*) search offline OR online
-.
-
-Repo Type:git-svn
-Repo:http://zanavi.cc/zanavi_public1/navit
-
-Auto Update Mode:None
-Update Check Mode:Market
-Current Version:2.0.7
-Current Version Code:207
-
diff --git a/metadata/de.ub0r.android.otpdroid.txt b/metadata/de.ub0r.android.otpdroid.txt
index f7c724584a..d57d133238 100644
--- a/metadata/de.ub0r.android.otpdroid.txt
+++ b/metadata/de.ub0r.android.otpdroid.txt
@@ -1,4 +1,3 @@
-Disabled:Do we really need another OTP generator?
 Category:Office
 License:Beer1.03
 Web Site:https://github.com/felixb/otpdroid/
@@ -7,10 +6,13 @@ Issue Tracker:https://github.com/felixb/otpdroid/issues
 
 Summary:OTP generator
 Description:
-An One Time Password (rfc2289) implementation for the Android (Fork of http://android.f00d.nl/opiekey/).
-It is used for logging into a (OTP enabled) system from an untrusted terminal by generating a password 
-that is only valid for one login. Supports SHA1 and MD5. Option to store passphrase and challenge
- (encrypted with IMEI (device) and IMSI (sim) via AES-256)
+An One Time Password (rfc2289) implementation for the Android: a fork of 
+[opiekey http://android.f00d.nl/opiekey].
+It is used for logging into a (OTP enabled) system from an untrusted terminal 
+by generating a password 
+that is only valid for one login. Supports SHA1 and MD5. Option to store 
+passphrase and challenge
+ (encrypted with IMEI (device) and IMSI (sim) via AES-256).
 .
 
 Repo Type:git
@@ -20,7 +22,7 @@ Build Version:2.1,157,5643184,srclibs=ub0rlib@75e4a553dd;ActionBarSherlock@6e3f2
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
 rm -f libs/ub0rlib.jar && echo "android.library.reference.2=$$ub0rlib$$" >> project.properties
 
-Update Check Mode:Market
+Update Check Mode:RepoManifest
 Current Version:2.1
 Current Version Code:157
 
diff --git a/metadata/dev.ukanth.ufirewall.txt b/metadata/dev.ukanth.ufirewall.txt
index f0fc498ff4..1480d6f8f1 100644
--- a/metadata/dev.ukanth.ufirewall.txt
+++ b/metadata/dev.ukanth.ufirewall.txt
@@ -1,4 +1,3 @@
-Disabled:Need to build busybox and iptables from source
 Category:Internet
 License:GPLv3
 Web Site:https://github.com/ukanth/afwall/
@@ -7,13 +6,16 @@ Issue Tracker:https://github.com/ukanth/afwall/issues
 
 Summary:Control network traffic
 Description:
-N.B. Due to an oversight, this app was included even though it includes some elements 
-that are not built from source i.e. busybox and iptables binaries. The build is
-left in, with the hope that a fully FOSS build can be provided soon, since the source
+N.B. Due to an oversight, this app was included even though it includes some 
+elements 
+that are not built from source i.e. busybox and iptables binaries. The build 
+is left in, with the hope that a fully FOSS build can be provided soon, since 
+the source
 exists in the Droidwall repo.
 
 Firewall (IPtables frontend), forked from DroidWall.
-See [https://github.com/ukanth/afwall/blob/master/Changelog.md changelog] for news.
+See [https://github.com/ukanth/afwall/blob/master/Changelog.md changelog] for 
+news.
 
 Requires root: Yes. iptables must run as root.
 .
@@ -23,7 +25,7 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/ukanth/afwall.git
 
-Build Version:1.0.3a,103,a52574f283,srclibs=ActionBarSherlock@4.1.0,prebuild=\
+Build Version:1.0.3a,103,!need to build iptables a52574f283,srclibs=ActionBarSherlock@4.1.0,prebuild=\
 sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
 Auto Update Mode:None
diff --git a/metadata/fr.miximum.qotd.txt b/metadata/fr.miximum.qotd.txt
deleted file mode 100644
index 9927405ed7..0000000000
--- a/metadata/fr.miximum.qotd.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#remove com.tj.qotd from repo -previously disabled
-Disabled:Sexist Content
-Category:Games
-License:GPLv3
-Web Site:https://github.com/thibault/OpenQOTD
-Source Code:https://github.com/thibault/OpenQOTD
-Issue Tracker:https://github.com/thibault/OpenQOTD/issues
-
-Summary:Widget to display random quotes
-Description:
-A simple widget that displays random quotes in English or French.
-.
-
-Repo Type:git
-Repo:https://github.com/thibault/OpenQOTD.git
-
-Build Version:2.0,4,2e53c649
diff --git a/metadata/fr.ybo.transportsrennes.txt b/metadata/fr.ybo.transportsrennes.txt
deleted file mode 100644
index 58efadef73..0000000000
--- a/metadata/fr.ybo.transportsrennes.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Disabled:Non-free Capptain library
-Category:Navigation
-License:GPLv3
-Web Site:https://github.com/ybonnel/TransportsRennes
-Source Code:https://github.com/ybonnel/TransportsRennes
-Issue Tracker:https://github.com/ybonnel/TransportsRennes/issues
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ybonnel%40gmail.com&item_name=Transports%20Rennes%20application%20donation&currency_code=EUR
-
-Summary:Bus/metro/bike information and navigation in Rennes, France
-Description:
-Transports Rennes provides quick access to information about public transportation of the city of 
-Rennes, France and its sprawl. Information come from the open data initiative by Keolis Rennes, the 
-company running Rennes' public transportation system.
-
-Features:
-* Bus and metro schedule (widget available for even faster access)
-* Bus/metro itinerary computation
-* Nearby bus stops and "LE vélo STAR" bikesharing stations
-* Number of available bikes in "LE vélo STAR" stations
-* Favorite bus stops, metro and bikesharing stations management
-* Available parking space in park-and-ride facilities
-* Sales outlets and park-and-ride facilities location via Google Maps
-* Disruption of service alerts and Twitter stream (@starbusmetro)
-.
-
-Repo Type:git
-Repo:https://github.com/ybonnel/TransportsRennes.git
-
-Update Check Mode:None
-
diff --git a/metadata/it.gtd.abreakout.GameActivity.txt b/metadata/it.gtd.abreakout.GameActivity.txt
index 3215644770..edad15f4af 100644
--- a/metadata/it.gtd.abreakout.GameActivity.txt
+++ b/metadata/it.gtd.abreakout.GameActivity.txt
@@ -1,4 +1,3 @@
-Disabled:Need Necessitas sdk
 Category:Games
 License:NetBSD
 Web Site:http://en.wikipedia.org/wiki/Breakout_(video_game)
@@ -12,8 +11,12 @@ the paddle is to glide your finger across the top of the screen.
 
 N.B. The app is written in Qt so you need to install the Ministro app before running
 this. If the Qt libraries are not already present Ministro will fetch them.
+
+This app requires the Necessitas SDK to build
 .
 
+#Would need necessitas SDK
+
 Update Check Mode:None
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/jp.sblo.pandora.jota.txt b/metadata/jp.sblo.pandora.jota.txt
deleted file mode 100644
index e571b731f4..0000000000
--- a/metadata/jp.sblo.pandora.jota.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Disabled:Build problem, uses Android private API
-Category:Office
-License:Apache2
-Web Site:https://sites.google.com/site/aquamarinepandora/home/jota-text-editor
-Source Code:http://code.google.com/p/jota-text-editor/source/checkout
-Issue Tracker:http://code.google.com/p/jota-text-editor/issues/list
-
-Summary:Jota text editor
-Description:
-Text editor designed for long text files, up to 1 million characters.
-Auto-Detect many character codes, especially Asian ones.
-Search/replace sith regular expression, undo/redo, syntax highlight, customization.
-.
-
-Repo Type:svn
-Repo:http://jota-text-editor.googlecode.com/svn/trunk/
-
-Build Version:0.2.07,57,86,buildjni=yes,target=android-11
-Build Version:0.2.13,63,113,buildjni=yes,target=android-11
-
-Auto Update Mode:None
-Update Check Mode:Market
-Current Version:0.2.30
-Current Version Code:80
-
diff --git a/metadata/me.shkschneider.dropbearserver.txt b/metadata/me.shkschneider.dropbearserver.txt
index 19d8eeea06..cc106fadb5 100644
--- a/metadata/me.shkschneider.dropbearserver.txt
+++ b/metadata/me.shkschneider.dropbearserver.txt
@@ -1,4 +1,3 @@
-Disabled:Now builds dropbear binaries, but work is needed to make these binaries integrate with this app!
 Category:System
 License:GPLv2
 Web Site:https://github.com/shkschneider/android_DropBearServer
@@ -7,7 +6,10 @@ Issue Tracker:https://github.com/shkschneider/android_DropBearServer/issues
 
 Summary:SSH Server using DropBear
 Description:
-This is a SSH server using DropBear, allows you to easily install, configure and run a Secured SHell server.
+N.B DropBear app v2 now available!
+
+This is a SSH server using DropBear, allows you to easily install, configure 
+and run a Secured SHell server.
 .
 
 Repo Type:git
@@ -15,7 +17,7 @@ Repo:https://github.com/shkschneider/android_DropBearServer.git
 
 # the (closed) issue to remove the patch has been created at https://github.com/shkschneider/android_DropBearServer/issues/5
 # D.B. the app builds with the patch but the CM dropbear repo is not producing dbclient according to res/raw
-Build Version:1.9.4,194,1.9.4,target=android-10,patch=ActionBar.patch,\
+Build Version:1.9.4,194,!no source for dbclient 1.9.4,target=android-10,patch=ActionBar.patch,\
 srclibs=ActionBar@c8341dc;UITableView@1665555424;ViewPagerTabs@67df90db08;Dropbear@07accdedf45,\
 buildjni=no,prebuild=\
 sed -i 's@\(android.library.reference.3=\).*@\1$$ActionBar$$@' project.properties && \
@@ -33,7 +35,5 @@ mv libs/armeabi/ssh res/raw/ssh && \
 mv libs/armeabi/sftp-client res/raw/sftp_client && \
 echo "Welcome to DropBear SSH Server!" > res/raw/banner
 
-Update Check Mode:Market
-Current Version:1.9.4
-Current Version Code:194
+Update Check Mode:None
 
diff --git a/metadata/net.exclaimindustries.geohashdroid.txt b/metadata/net.exclaimindustries.geohashdroid.txt
index 538e3eb1d0..647432f736 100644
--- a/metadata/net.exclaimindustries.geohashdroid.txt
+++ b/metadata/net.exclaimindustries.geohashdroid.txt
@@ -1,4 +1,3 @@
-Disabled:Can't build, source 'incomplete' due to API keys
 Category:Navigation
 License:NewBSD
 Web Site:https://code.google.com/p/geohashdroid/
@@ -7,9 +6,12 @@ Issue Tracker:https://code.google.com/p/geohashdroid/issues/list
 
 Summary:Geohash Droid is a simple Android Geohashing app.
 Description:
-Geohash Droid can auto-detect your graticule, calculate the day's meetup point, and follow you as you travel towards it.
+Geohash Droid can auto-detect your graticule, calculate the day's meetup point, 
+and follow you as you travel towards it.
 
-Future features include tracking other people (at mutual discretion), storing a history of meetup points found, and automatically marking pictures taken near the point.
+Future features include tracking other people (at mutual discretion), storing a 
+history of meetup points found, and automatically marking pictures taken near 
+the point.
 
 Oh, and achievement support. That's coming soonish. 
 
@@ -18,11 +20,9 @@ Oh, and achievement support. That's coming soonish.
 Repo Type:git
 Repo:https://code.google.com/p/geohashdroid/
 
-#Enter a maps api key
-Build Version:0.7.17,702,b82c9dc6f747,prebuild=echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<resources>\n\
+
+Build Version:0.7.17,702,!Enter a Google Maps API key into recipe b82c9dc6f747,prebuild=echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<resources>\n\
 <string name=\"api_map_key\">MAPS_DEBUG_KEY</string>\n</resources>" > res/values/api.xml
 
-Update Check Mode:Market
-Current Version:0.7.17
-Current Version Code:702
+Update Check Mode:None
 
diff --git a/metadata/org.ab.x48.txt b/metadata/org.ab.x48.txt
index a31ebf9d20..597e6cb799 100644
--- a/metadata/org.ab.x48.txt
+++ b/metadata/org.ab.x48.txt
@@ -1,4 +1,3 @@
-Disabled:Bundled ROM has field of use restrictions
 Category:Science & Education
 License:GPLv3
 Web Site:https://github.com/shagr4th/droid48
@@ -13,10 +12,8 @@ Emulated HP48. The bundled ROM is free for non-commercial use
 Repo Type:git
 Repo:https://github.com/shagr4th/droid48.git
 
-Build Version:1.35,35,da314fd,buildjni=yes
+Build Version:1.35,35,!Bundled ROM has field of use restrictions da314fd,buildjni=yes
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.43
-Current Version Code:43
+Update Check Mode:None
 
diff --git a/metadata/org.aprsdroid.app.txt b/metadata/org.aprsdroid.app.txt
index fdec4e6576..e3b7077415 100644
--- a/metadata/org.aprsdroid.app.txt
+++ b/metadata/org.aprsdroid.app.txt
@@ -1,4 +1,3 @@
-Disabled:Scala code
 Category:Internet
 License:GPLv2
 Web Site:http://aprsdroid.org
@@ -7,16 +6,16 @@ Issue Tracker:https://github.com/ge0rg/aprsdroid/issues
 
 Summary:App for Amateur Radio Operators
 Description:
-Report your position to the APRS-IS network and view nearby stations on a map. Aradio operator callsign is required.
+Report your position to the APRS-IS network and view nearby stations on a map. 
+A radio operator callsign is required.
 .
 
 Repo Type:git
 Repo:https://github.com/ge0rg/aprsdroid.git
 
-Auto Update Mode:None
-Update Check Mode:Market
-Current Version:1.2.2
-Current Version Code:13
-
 #Missing AudioBufferProcessor.java...
-#Build Version:1.2.0,10,6060f53846
+Build Version:1.2.0,10,!contains scala code 6060f53846
+
+Auto Update Mode:None
+Update Check Mode:None
+
diff --git a/metadata/org.beide.droidgain.txt b/metadata/org.beide.droidgain.txt
index 32a755454c..9312911461 100644
--- a/metadata/org.beide.droidgain.txt
+++ b/metadata/org.beide.droidgain.txt
@@ -13,7 +13,7 @@ Normalizes mp3 files (it makes them all sound equally loud).
 Repo Type:git
 Repo:git://github.com/beide/Droidgain.git
 
-#Disabled build - requires a one line change to the ndk - may work with next revision
+#Disabled build - requires a one line change to the ndk
 Build Version:1.0,1,!needs ndk fix 3cf8be7ebcff4470199c95271537790dc7416063,buildjni=yes
 
 Update Check Mode:None
diff --git a/metadata/org.curiouscreature.android.shelves.txt b/metadata/org.curiouscreature.android.shelves.txt
index 7f9e20727f..8b5a16ad09 100644
--- a/metadata/org.curiouscreature.android.shelves.txt
+++ b/metadata/org.curiouscreature.android.shelves.txt
@@ -21,6 +21,4 @@ Build Version:1.5,2,!No source code apparently
 
 #not in market
 Update Check Mode:None
-Current Version:1.5
-Current Version Code:2
 
diff --git a/metadata/org.envaya.sms.txt b/metadata/org.envaya.sms.txt
index cf6fa9e187..87503b83f8 100644
--- a/metadata/org.envaya.sms.txt
+++ b/metadata/org.envaya.sms.txt
@@ -1,4 +1,3 @@
-Disabled:See http://f-droid.org/forums/topic/envayasms/
 Category:Internet
 License:MIT
 Web Site:https://sms.envaya.org
@@ -8,23 +7,28 @@ Donate:http://envaya.org/envaya/page/contribute
 
 Summary:SMS to internet gateway
 Description:
-EnvayaSMS can be used to enable any web service to send and receive SMS and MMS messages nearly anywhere 
-in the world. In particular, it is useful in countries where obtaining a local virtual phone number or SMS 
-shortcode is difficult, expensive, or impossible. A phone running EnvayaSMS connects to the phone network in 
-the same way as any other mobile phone, so it can be set up without needing approval from anyone else.
+EnvayaSMS can be used to enable any web service to send and receive SMS and 
+MMS messages nearly anywhere 
+in the world. In particular, it is useful in countries where obtaining a local 
+virtual phone number or SMS 
+shortcode is difficult, expensive, or impossible. A phone running EnvayaSMS 
+connects to the phone network in 
+the same way as any other mobile phone, so it can be set up without needing 
+approval from anyone else.
 
-EnvayaSMS is designed to to be maintainable even when deployed in remote locations that cannot easily be 
-accessed by your organization's technical staff. With minimal training, non-technical users can do all setup 
-and maintenance of deployed phones. The number of SMS' that can be sent is capped by Android at 100/hour. 
+EnvayaSMS is designed to to be maintainable even when deployed in remote 
+locations that cannot easily be 
+accessed by your organization's technical staff. With minimal training, 
+non-technical users can do all setup 
+and maintenance of deployed phones. The number of SMS' that can be sent is 
+capped by Android at 100/hour. 
 Expansion pack apks, not yet available from f-droid.org can lift this limit.
 .
 
 Repo Type:git
 Repo:https://github.com/youngj/EnvayaSMS.git
 
-Build Version:3.0.1,30,69a05acd
+Build Version:3.0.1,30,!issues around distribution of addon apks 69a05acd
 
-Update Check Mode:Market
-Current Version:3.0.1
-Current Version Code:30
+Update Check Mode:None
 
diff --git a/metadata/org.fosdem.txt b/metadata/org.fosdem.txt
index b7d3a7c97f..7b62ee403f 100644
--- a/metadata/org.fosdem.txt
+++ b/metadata/org.fosdem.txt
@@ -1,4 +1,3 @@
-Disabled:Until next year...
 Category:Office
 License:GPLv3
 Web Site:http://fosdem.org
@@ -27,7 +26,7 @@ Repo:https://github.com/orrc/fosdem-android
 
 Build Version:1.0.2,4,!broken now 117
 #Build Version:1.0.3,5,!Source for this market version not in repo
-Build Version:2.0.0,50,5791487b72,forcevercode=yes,subdir=app,submodules=yes,update=\
+Build Version:2.0.0,50,!until next year 5791487b72,forcevercode=yes,subdir=app,submodules=yes,update=\
 .;../libraries/ActionBarSherlock/library/;../libraries/StickyListHeaders/library
 
 Auto Update Mode:None
diff --git a/metadata/org.hedgewars.hedgeroid.txt b/metadata/org.hedgewars.hedgeroid.txt
deleted file mode 100644
index fd1cac0865..0000000000
--- a/metadata/org.hedgewars.hedgeroid.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Disabled:Needs more work to build - where is the oggvorbis code? Also, license issues with some of the anonymous zips.
-Category:Games
-License:GPLv2
-Web Site:http://code.google.com/p/hedgewars/
-Source Code:http://code.google.com/p/hedgewars/source/checkout
-Issue Tracker:http://code.google.com/p/hedgewars/issues/list
-
-Summary:
-Description:
-No description available
-.
-
-Repo Type:hg
-Repo:https://code.google.com/p/hedgewars/
-
-Build Version:0.2,8,ce2b24995ab2,subdir=project_files/Android-build/SDL-android-project,buildjni=yes,target=android-13,init=cd .. && ./download_libs.sh
-
-Update Check Mode:Market
-Current Version:0.2
-Current Version Code:8
-
diff --git a/metadata/org.hermit.audalyzer.txt b/metadata/org.hermit.audalyzer.txt
index de1f7f7210..20f1ff34c5 100644
--- a/metadata/org.hermit.audalyzer.txt
+++ b/metadata/org.hermit.audalyzer.txt
@@ -1,4 +1,4 @@
-Disabled:No repo
+Disabled:Because nobody wanted to build when it was still in a repo
 Category:Multimedia
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/Audalyzer
diff --git a/metadata/org.hermit.netscramble.txt b/metadata/org.hermit.netscramble.txt
index d4eb952071..63fdd36754 100644
--- a/metadata/org.hermit.netscramble.txt
+++ b/metadata/org.hermit.netscramble.txt
@@ -1,4 +1,4 @@
-Disabled:No repo
+Disabled:Need to host the source code in a repo
 Category:Games
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/ScrambledNet
diff --git a/metadata/org.mailboxer.saymyname.txt b/metadata/org.mailboxer.saymyname.txt
index 4dd639785c..895f96d550 100644
--- a/metadata/org.mailboxer.saymyname.txt
+++ b/metadata/org.mailboxer.saymyname.txt
@@ -12,8 +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.
 .
 
-#now abandoned in favour of a rewrite, Annoouncify (that doesn't have analytics, I think)
+#now abandoned in favour of a rewrite, Announcify that has other kinds or non free bits
 Update Check Mode:None
-Current Version:2.5.4.6 (http://goo.gl/N10G)
-Current Version Code:131
 
diff --git a/metadata/org.moparisthebest.appbak.txt b/metadata/org.moparisthebest.appbak.txt
index 5c1d33f573..52d5f348e4 100644
--- a/metadata/org.moparisthebest.appbak.txt
+++ b/metadata/org.moparisthebest.appbak.txt
@@ -19,7 +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]].
 .
 
-Update Check Mode:Market
+Update Check Mode:None
 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 dcbcd943a9..c040ae7624 100644
--- a/metadata/org.mrpdaemon.android.encdroid.txt
+++ b/metadata/org.mrpdaemon.android.encdroid.txt
@@ -1,4 +1,3 @@
-Disabled:Wait more features
 Category:System
 License:GPLv3
 Web Site:https://github.com/mrpdaemon/encdroid
@@ -13,7 +12,8 @@ No description available
 Repo Type:git
 Repo:https://github.com/mrpdaemon/encdroid.git
 
-Build Version:1.0,1,v1.0,target=android-13,srclibs=EncfsJava@v0.1,extlibs=\
+Build Version:1.0,1,!only publish when provider that doesn't require API keys is available or we have an ssh or rsync app in the repository v1.0,\
+target=android-13,srclibs=EncfsJava@v0.1,extlibs=\
 dropbox-sdk/dropbox-android-sdk-1.5.1.jar;httpmime/httpmime-4.0.3.jar;json-simple/json_simple-1.1.jar,\
 prebuild=mvn package -f $$EncfsJava$$/pom.xml && cp $$EncfsJava$$/target/encfs-java-0.1.jar libs/
 
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 3e9121220e..ba73af1a1a 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -15,7 +15,5 @@ work very well!
 ##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/
 
-Update Check Mode:Market
-Current Version:navit
-Current Version Code:5197
+Update Check Mode:None
 
diff --git a/metadata/org.openintents.flashlight.txt b/metadata/org.openintents.flashlight.txt
deleted file mode 100644
index 00a1287729..0000000000
--- a/metadata/org.openintents.flashlight.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Disabled:Apparently non-free binary hardware09.jar
-Category:Office
-License:Apache2
-Web Site:http://code.google.com/p/openintents
-Source Code:http://code.google.com/p/openintents/source/browse/#svn%2Ftrunk%2Fflashlight%2FFlashlight
-Issue Tracker:http://code.google.com/p/openintents/issues
-
-Summary:A flashlight to see in the dark
-Description:
-A flashlight with color settings.
-It can use the phone's screen, or the flash of the phone's camera if there is one.
-.
-
-Repo Type:srclib
-Repo:OI:flashlight
-
-Build Version:1.1,10011,3971,target=android-15,subdir=Flashlight
-
-Update Check Mode:Market
-Current Version:1.1
-Current Version Code:10011
-
diff --git a/metadata/org.openintents.newsreader.txt b/metadata/org.openintents.newsreader.txt
deleted file mode 100644
index 549a9dfec9..0000000000
--- a/metadata/org.openintents.newsreader.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Disabled:Proprietary EULA. Also, possible build problem - force closes on startup.
-Category:Internet
-License:Apache2
-Web Site:http://www.openintents.org/en/newsreader
-Source Code:http://code.google.com/p/openintents/source/checkout
-Issue Tracker:http://code.google.com/p/openintents/issues/list
-Donate:http://www.openintents.org/en/contribute
-
-Summary:Feed reader
-Description:
-A feed reader, with offline support.
-.
-
-Repo Type:srclib
-Repo:OI:newsreader
-
-Build Version:1.1.1,65549,3272,subdir=NewsReader,target=android-3
-
-Update Check Mode:None
diff --git a/metadata/org.openintents.notepad.txt b/metadata/org.openintents.notepad.txt
deleted file mode 100644
index 7026f00319..0000000000
--- a/metadata/org.openintents.notepad.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Disabled:Apparently non-free binary OINotepadMyBackupPro.jar
-Category:Office
-License:Apache2
-Web Site:http://www.openintents.org/en/notepad
-Source Code:https://code.google.com/p/openintents/source/checkout
-Issue Tracker:https://code.google.com/p/openintents/issues/list
-
-Summary:Notepad
-Description:
-OI Notepad allows to create, edit, send, and delete notes.
-.
-
-Repo Type:srclib
-Repo:OI:notepad
-
-Update Check Mode:Market
-Current Version:1.4.0.7
-Current Version Code:10074
-
diff --git a/metadata/org.osmdroid.txt b/metadata/org.osmdroid.txt
index 36ecad2266..0f59ce427c 100644
--- a/metadata/org.osmdroid.txt
+++ b/metadata/org.osmdroid.txt
@@ -1,4 +1,4 @@
-Disabled:Build problems
+Disabled:This app may become viable but has been disabled to hide the developer apks
 Category:Navigation
 License:LGPL
 Web Site:http://code.google.com/p/osmdroid/
@@ -17,7 +17,7 @@ Repo Type:git-svn
 Repo:http://osmdroid.googlecode.com/svn/trunk/
 
 #see http://code.google.com/p/osmdroid/wiki/HowToMaven 
-Build Version:3.0.8,9,1072,subdir=OpenStreetMapViewer,target=Google Inc.:Google APIs:10,\
+Build Version:3.0.8,9,!tricky build 1072,subdir=OpenStreetMapViewer,target=Google Inc.:Google APIs:10,\
 extlibs=apache-mime/apache-mime4j-core-0.7.2.jar;httpmime/httpmime-4.0.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;\
 junit/junit-4.10.jar;mapsforge/mapsforge-map-0.3.0-jar-with-dependencies.jar,prebuild=\
 cp -r ../osmdroid-android/src/main/java/* src/ && cp -r ../OSMMapTilePackager/src/*  src/ && \
diff --git a/metadata/org.projectvoodoo.audiomeasurementsplayer.txt b/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
index 3317eb3320..334e41a019 100644
--- a/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
+++ b/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
@@ -1,4 +1,3 @@
-Disabled:Missing audio resources
 Category:Multimedia
 License:GPL
 Web Site:https://github.com/project-voodoo/audio-measurements-player-app
@@ -8,21 +7,27 @@ Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=curio%40fre
 
 Summary:Tool for making audio measurements
 Description:
-Little app that plays RMAA and udial samples to ease Android devices sound performance measurements. 
-In order to complete measurements, connect your phone or tablet headphone/line-out JACK to a computer with 
-a high quality soundcard line-in then record the output manually or with RMAA program directly. Samples 
-are compressed in lossless FLAC format to reduce APK size. Using this app instead of playing samples 
-through a vendor or third-party music player lets you be sure no signal processing is done by the player.
+Little app that plays RMAA and udial samples to ease Android devices sound 
+performance measurements. 
+In order to complete measurements, connect your phone or tablet 
+headphone/line-out JACK to a computer with 
+a high quality soundcard line-in then record the output manually or with RMAA 
+program directly. Samples 
+are compressed in lossless FLAC format to reduce APK size. Using this app 
+instead of playing samples 
+through a vendor or third-party music player lets you be sure no signal 
+processing is done by the player.
 
-If the manufacturer adds audio effects, you’ll be able to spot them with confidence through measurement.
-Without additional (like SRS, Beats audio) processing and if digital volume is maxed out, DAC will be fed by un-altered PCM data.
+If the manufacturer adds audio effects, you’ll be able to spot them with 
+confidence through measurement.
+Without additional (like SRS, Beats audio) processing and if digital volume is 
+maxed out, DAC will be fed by un-altered PCM data.
 .
 
 Repo Type:git
 Repo:https://github.com/project-voodoo/audio-measurements-player-app.git
 
-#not working on p990 with wierd custom rom, tried another build too
-Build Version:1.1.4,8,6fcff
+Build Version:1.1.4,8,!missing audio resources 6fcff
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/org.webodf.txt b/metadata/org.webodf.txt
index 0a294f4795..3fd6030695 100644
--- a/metadata/org.webodf.txt
+++ b/metadata/org.webodf.txt
@@ -1,4 +1,3 @@
-Disabled:Non-functional
 Category:Office
 License:AGPL
 Web Site:https://gitorious.org/webodf/webodf
@@ -7,14 +6,15 @@ Issue Tracker:http://webodf.org/redmine/projects/webodf/issues
 
 Summary:Document Viewer
 Description:
-WebODF is a library that allows ODF files to be viewed in browsers and in apps. This app lets you 
+WebODF is a library that allows ODF files to be viewed in browsers and in apps. 
+This app lets you 
 view Open Document format files directly.
 .
 
 Repo Type:git
 Repo:https://git.gitorious.org/webodf/webodf.git
 
-Build Version:1.2,3,5262fc,subdir=programs/android,submodules=no,update=no,\
+Build Version:1.2,3,!broken app script needs fixing 5262fc,subdir=programs/android,submodules=no,update=no,\
 init=cd ../../ && sed -i '4\,6d' .gitmodules && sed -i '12\,13d' .git/config && \
 git rm --cached simplerevisionserver/pywebdav && git submodule init && git submodule update && \
 cd programs/android,\
diff --git a/metadata/org.witness.informacam.txt b/metadata/org.witness.informacam.txt
index fbe85c7d20..ef15e4222b 100644
--- a/metadata/org.witness.informacam.txt
+++ b/metadata/org.witness.informacam.txt
@@ -1,4 +1,3 @@
-Disabled:App isn't released yet
 Category:Multimedia
 License:GPL
 Web Site:https://guardianproject.info/apps/informacam
@@ -7,22 +6,30 @@ Issue Tracker:https://github.com/guardianproject/InformaCam/issues
 
 Summary:Image redactor
 Description:
-InformaCam is a plugin for ObscuraCam that allows the user, without much intervention on their own part, 
-to inflate image and video with extra points of data, or metadata. The metadata includes information like 
-the user’s current GPS coordinates, altitude, compass bearing, light meter readings, the signatures of 
-neighboring devices, cell towers, and wifi networks; and serves to shed light on the exact circumstances 
-and contexts under which the digital image was taken. Some users will already be familiar with ObscuraCam, 
-which allows for capturing and digitally manipulating media. With InformaCam included, the app starts to 
-behave almost like Adobe Photoshop or GIMP, supporting non-destructive, layer-based edits to media. This 
-means that a version of an image can be created with any sensitive image data and metadata preserved and 
-encrypted to trusted entities, along with a redacted version that has its metadata stripped which can be 
-easily shared. 
+InformaCam is a plugin for ObscuraCam that allows the user, without much 
+intervention on their own part, 
+to inflate image and video with extra points of data, or metadata. The 
+metadata includes information like 
+the user’s current GPS coordinates, altitude, compass bearing, light meter 
+readings, the signatures of 
+neighboring devices, cell towers, and wifi networks; and serves to shed light 
+on the exact circumstances 
+and contexts under which the digital image was taken. Some users will 
+already be familiar with ObscuraCam, 
+which allows for capturing and digitally manipulating media. With 
+InformaCam included, the app starts to 
+behave almost like Adobe Photoshop or GIMP, supporting non-destructive, 
+layer-based edits to media. This 
+means that a version of an image can be created with any sensitive image data 
+and metadata preserved and 
+encrypted to trusted entities, along with a redacted version that has its 
+metadata stripped which can be easily shared. 
 .
 
 Repo Type:git
 Repo:https://github.com/guardianproject/InformaCam.git
 
-Build Version:1.0,1,d20d57b8a3,buildjni=yes,srclibs=FFMPEG-Java@5427fe5e;IOCipher@56a23bbdfa,prebuild=\
+Build Version:1.0,1,!not released yet d20d57b8a3,srclibs=FFMPEG-Java@5427fe5e;IOCipher@56a23bbdfa,prebuild=\
 cp -r $$FFMPEG-Java$$ FFMPEG-Java  && cp -r $$IOCipher$$ IOCipher && \
 sed -i 's@\(android.library.reference.1=\).*@\1FFMPEG-Java@' project.properties && \
 sed -i 's@\(android.library.reference.2=\).*@\1IOCipher@' project.properties && \
@@ -30,9 +37,7 @@ export NDK_BASE=$$NDK$$ && cd FFMPEG-Java && git submodule update --init --recur
 cd external/android-ffmpeg && sed -i 's/make -j4/make -j2/g' make_* && \
 ./configure_make_everything.sh && cd ../../../IOCipher && \
 git submodule init && git submodule update && sed -i 's/make -j4/make -j2/g' external/Makefile && \
-make -C external && ndk-build
+make -C external && $$NDK$$/ndk-build,buildjni=yes
 
 Update Check Mode:None
-Current Version:1.0
-Current Version Code:1
 
diff --git a/metadata/org.witness.sscphase1.txt b/metadata/org.witness.sscphase1.txt
deleted file mode 100644
index 9ab7063fde..0000000000
--- a/metadata/org.witness.sscphase1.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Disabled:Can't build, incomplete source?
-Category:Multimedia
-License:GPLv3
-Web Site:https://guardianproject.info/apps/securecam/
-Source Code:https://github.com/guardianproject/SecureSmartCam
-Issue Tracker:https://github.com/guardianproject/SecureSmartCam/issues
-Donate:http://witness.org/Donate
-
-Summary:Keep it simple, keep it safe
-Description:
-Anonymize your photos and videos
-.
-
-Repo Type:git
-Repo:git://github.com/guardianproject/SecureSmartCam.git
-
-#Source appears to be incomplete:
-#org.witness.sscphase1/jni/redaction.h:24:24: error: bit_shifts.h: No such file or directory
-#Build Version:1.0,1,7b55a4fc2,buildjni=yes
-
-Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index 6b6d958fdc..7fac1dda59 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -1,4 +1,3 @@
-Disabled:Need to build busybox binaries from source with NDK
 Category:System
 License:Apache2
 Web Site:http://code.google.com/p/busybox-android/
@@ -21,7 +20,7 @@ Requires Root:Yes
 Repo Type:git-svn
 Repo:http://busybox-android.googlecode.com/svn/trunk/
 
-Build Version:7.1,103,3,target=android-8,prebuild=\
+Build Version:7.1,103,!busybox prebuilt binaries 3,target=android-8,prebuild=\
 cd src/stericson &&\
 svn co -r 133 http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools &&\
 cd ../..
@@ -31,7 +30,7 @@ Build Version:7.6.1,112,!No source available
 Build Version:7.8.3,117,!No source available
 #Sketch: Blobs in assets apart from Busybox and /src/.../Constants.java needs patching
 #sed errors when executing make
-Build Version:9.6.3,141,26,subdir=app,srclibs=\
+Build Version:9.6.3,141,!problems with BusyBox Makefile 26,subdir=app,srclibs=\
 ViewPagerIndicator@2.2.3;RootTools@211;BusyboxConfigs@835af752d,prebuild=\
 sed -i 's@\(android.library.reference.1=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
 rm -f ../binaries/* && mkdir -p libs/ && cp -r $$RootTools$$ . && cd RootTools && ant debug && \
diff --git a/metadata/to.networld.android.foafviewer.txt b/metadata/to.networld.android.foafviewer.txt
deleted file mode 100644
index 8d7f502543..0000000000
--- a/metadata/to.networld.android.foafviewer.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Disabled:Build problem
-Category:Office
-License:MIT
-Web Site:http://foafviewer.android.networld.to
-Source Code:https://github.com/obale/foafviewer
-Issue Tracker:https://github.com/obale/foafviewer/issues
-
-Summary:FOAF (Friend Of A Friend) Viewer
-Description:
-FOAF (Friend Of A Friend) Viewer with support for recursive
-following of friend relation and caching mechanism for offline
-view.
-.
-
-Repo Type:git
-Repo:https://github.com/obale/foafviewer.git
-
-Build Version:0.11,3,FOAFViewer_v0.11,prebuild=mkdir libs && cd libs && wget http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.3.zip && unzip -j jaxen-1.1.3.zip jaxen-1.1.3/jaxen-1.1.3.jar && rm *.zip && wget -O org.dom4j.jar http://sourceforge.net/projects/dom4j/files/dom4j-2.0.0-ALPHA-2/dom4j-2.0.0-ALPHA-2.jar/download && cd ..
-
-#Not in market
-Update Check Mode:None
-