diff --git a/lib/stream.cpp b/lib/stream.cpp
index 0d6bbd0b..8218e56a 100644
--- a/lib/stream.cpp
+++ b/lib/stream.cpp
@@ -122,22 +122,11 @@ bool Util::streamAlive(std::string & streamname){
 }
 
 /// Assures the input for the given stream name is active.
-/// Does stream name sanitizion first, followed by a stream name length check (<= 100 chars).
-/// Then, checks if an input is already active by running streamAlive(). If yes, aborts.
-/// If no, loads up the server configuration and attempts to start the given stream according to current config.
+/// Does stream name sanitation first, followed by a stream name length check (<= 100 chars).
+/// Then, checks if an input is already active by running streamAlive(). If yes, return true.
+/// If no, loads up the server configuration and attempts to start the given stream according to current configuration.
 /// At this point, fails and aborts if MistController isn't running.
-/// \triggers 
-/// The `"STREAM_LOAD"` trigger is stream-specific, and is ran right before launching an input for an inactive stream. If cancelled, the input is not launched. Its payload is:
-/// ~~~~~~~~~~~~~~~
-/// streamname
-/// ~~~~~~~~~~~~~~~
-/// The `"STREAM_SOURCE"` trigger is stream-specific, and is ran right before launching an input for an inactive stream. It cannot be cancelled, but an invalid source can be returned; which is effectively equivalent to cancelling.
-/// This trigger is special: the response is used as source override for this stream, and not handled as normal. If used, the handler for this trigger MUST return a valid source to allow the stream input to load up at all. If used multiple times, the last defined handler overrides any and all previous handlers.
-/// Its payload is:
-/// ~~~~~~~~~~~~~~~
-/// streamname
-/// ~~~~~~~~~~~~~~~
-bool Util::startInput(std::string streamname, std::string filename, bool forkFirst) {
+bool Util::startInput(std::string streamname, std::string filename, bool forkFirst, bool isProvider) {
   sanitizeName(streamname);
   if (streamname.size() > 100){
     FAIL_MSG("Stream opening denied: %s is longer than 100 characters (%lu).", streamname.c_str(), streamname.size());
@@ -214,6 +203,7 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
   DTSC::Scan inputs = config.getMember("capabilities").getMember("inputs");
   DTSC::Scan input;
   unsigned int input_size = inputs.getSize();
+  bool noProviderNoPick = false;
   for (unsigned int i = 0; i < input_size; ++i){
     DTSC::Scan tmp_input = inputs.getIndice(i);
     
@@ -227,6 +217,10 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
           MEDIUM_MSG("Checking input %s: %s (%s)", inputs.getIndiceName(i).c_str(), tmp_input.getMember("name").asString().c_str(), source.c_str());
           
           if (filename.substr(0,front.size()) == front && filename.substr(filename.size()-back.size()) == back){
+            if (tmp_input.getMember("non-provider") && !isProvider){
+              noProviderNoPick = true;
+              continue;
+            }
             player_bin = Util::getMyPath() + "MistIn" + tmp_input.getMember("name").asString();
             curPrio = tmp_input.getMember("priority").asInt();
             selected = true;
@@ -240,6 +234,10 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
         MEDIUM_MSG("Checking input %s: %s (%s)", inputs.getIndiceName(i).c_str(), tmp_input.getMember("name").asString().c_str(), source.c_str());
         
         if (filename.substr(0,front.size()) == front && filename.substr(filename.size()-back.size()) == back){
+          if (tmp_input.getMember("non-provider") && !isProvider){
+            noProviderNoPick = true;
+            continue;
+          }
           player_bin = Util::getMyPath() + "MistIn" + tmp_input.getMember("name").asString();
           curPrio = tmp_input.getMember("priority").asInt();
           selected = true;
@@ -252,7 +250,11 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
   
   if (!selected){
     configLock.post();//unlock the config semaphore
-    FAIL_MSG("No compatible input found for stream %s: %s", streamname.c_str(), filename.c_str());
+    if (noProviderNoPick){
+      INFO_MSG("Not a media provider for stream %s: %s", streamname.c_str(), filename.c_str());
+    }else{
+      FAIL_MSG("No compatible input found for stream %s: %s", streamname.c_str(), filename.c_str());
+    }
     return false;
   }
 
@@ -470,4 +472,3 @@ static std::string strftime_now(const std::string& format) {
   return buffer;
 }
 
-/* roxlu-end */
diff --git a/lib/stream.h b/lib/stream.h
index faff3fd4..649266cc 100644
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -10,7 +10,7 @@ namespace Util {
   std::string getTmpFolder();
   void sanitizeName(std::string & streamname);
   bool streamAlive(std::string & streamname);
-  bool startInput(std::string streamname, std::string filename = "", bool forkFirst = true);
+  bool startInput(std::string streamname, std::string filename = "", bool forkFirst = true, bool isProvider = false);
   int startPush(const std::string & streamname, std::string & target);
   JSON::Value getStreamConfig(std::string streamname);
 }
diff --git a/src/input/input.cpp b/src/input/input.cpp
index 982b858c..929f6694 100644
--- a/src/input/input.cpp
+++ b/src/input/input.cpp
@@ -293,6 +293,7 @@ namespace Mist {
     }
     finish();
     DEBUG_MSG(DLVL_DEVEL, "Input for stream %s closing clean", streamName.c_str());
+    userPage.finishEach();
     //end player functionality
   }
 
@@ -358,7 +359,7 @@ namespace Mist {
       WARN_MSG("Stream already online, cancelling");
       return;
     }
-    if (!Util::startInput(streamName, "push://INTERNAL_ONLY:"+config->getString("input"))) {//manually override stream url to start the buffer
+    if (!Util::startInput(streamName, "push://INTERNAL_ONLY:"+config->getString("input"), true, true)) {//manually override stream url to start the buffer
       pullLock.post();
       pullLock.close();
       pullLock.unlink();
diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp
index 7b390a5d..22a18cc2 100644
--- a/src/input/input_buffer.cpp
+++ b/src/input/input_buffer.cpp
@@ -85,6 +85,7 @@ namespace Mist {
     /*LTS-end*/
 
     capa["source_match"] = "push://*";
+    capa["non-provider"] = true;//Indicates we don't provide data, only collect it
     capa["priority"] = 9ll;
     capa["desc"] = "Provides buffered live input";
     capa["codecs"][0u][0u].append("*");
diff --git a/src/output/output.cpp b/src/output/output.cpp
index a33b9ba2..8f7b2ed2 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -307,7 +307,7 @@ namespace Mist{
         return;
       }
     }else{
-      if (!Util::startInput(streamName)){
+      if (!Util::startInput(streamName, "", true, isPushing())){
         FAIL_MSG("Opening stream %s failed - aborting initialization", streamName.c_str());
         onFail();
         return;
@@ -346,8 +346,8 @@ namespace Mist{
     updateMeta();
     selectDefaultTracks();
     if (!myMeta.vod && !isReadyForPlay()){
-      unsigned long long waitUntil = Util::epoch() + 15;
-      while (!myMeta.vod && !isReadyForPlay()){
+      unsigned long long waitUntil = Util::epoch() + 30;
+      while (!myMeta.vod && !isReadyForPlay() && nProxy.userClient.isAlive()){
         if (Util::epoch() > waitUntil + 45 || (!selectedTracks.size() && Util::epoch() > waitUntil)){
           INFO_MSG("Giving up waiting for playable tracks. Stream: %s, IP: %s", streamName.c_str(), getConnectedHost().c_str());
           break;
diff --git a/src/output/output_http.cpp b/src/output/output_http.cpp
index 4c4ca5a4..f0131e62 100644
--- a/src/output/output_http.cpp
+++ b/src/output/output_http.cpp
@@ -230,32 +230,34 @@ namespace Mist {
       }
 
       INFO_MSG("Received request %s", H.getUrl().c_str());
-      selectedTracks.clear();
-      if (H.GetVar("audio") != ""){
-        selectedTracks.insert(JSON::Value(H.GetVar("audio")).asInt());
-      }
-      if (H.GetVar("video") != ""){
-        selectedTracks.insert(JSON::Value(H.GetVar("video")).asInt());
-      }
-      selectDefaultTracks();
-      std::set<unsigned long> toRemove;
-      if (H.GetVar("video") == "0"){
-        for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
-          if (myMeta.tracks.at(*it).type=="video"){
-            toRemove.insert(*it);
+      if (H.GetVar("audio") != "" || H.GetVar("video") != ""){
+        selectedTracks.clear();
+        if (H.GetVar("audio") != ""){
+          selectedTracks.insert(JSON::Value(H.GetVar("audio")).asInt());
+        }
+        if (H.GetVar("video") != ""){
+          selectedTracks.insert(JSON::Value(H.GetVar("video")).asInt());
+        }
+        selectDefaultTracks();
+        std::set<unsigned long> toRemove;
+        if (H.GetVar("video") == "0"){
+          for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
+            if (myMeta.tracks.at(*it).type=="video"){
+              toRemove.insert(*it);
+            }
           }
         }
-      }
-      if (H.GetVar("audio") == "0"){
-        for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
-          if (myMeta.tracks.at(*it).type=="audio"){
-            toRemove.insert(*it);
+        if (H.GetVar("audio") == "0"){
+          for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
+            if (myMeta.tracks.at(*it).type=="audio"){
+              toRemove.insert(*it);
+            }
           }
         }
-      }
-      //remove those from selectedtracks
-      for (std::set<unsigned long>::iterator it = toRemove.begin(); it != toRemove.end(); it++){
-        selectedTracks.erase(*it);
+        //remove those from selectedtracks
+        for (std::set<unsigned long>::iterator it = toRemove.begin(); it != toRemove.end(); it++){
+          selectedTracks.erase(*it);
+        }
       }
 
       onHTTP();
diff --git a/src/output/output_http_internal.cpp b/src/output/output_http_internal.cpp
index 99af8799..6d20be65 100644
--- a/src/output/output_http_internal.cpp
+++ b/src/output/output_http_internal.cpp
@@ -53,11 +53,6 @@ namespace Mist {
     Output::onFail();
   }
 
-  /// The HTTP output is always ready to play
-  bool OutHTTP::isReadyForPlay() {
-    return true;
-  }
-  
   void OutHTTP::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa.removeMember("deps");
@@ -65,6 +60,7 @@ namespace Mist {
     capa["desc"] = "Generic HTTP handler, required for all other HTTP-based outputs.";
     capa["provides"] = "HTTP";
     capa["protocol"] = "http://";
+    capa["codecs"][0u][0u].append("*");
     capa["url_match"].append("/crossdomain.xml");
     capa["url_match"].append("/clientaccesspolicy.xml");
     capa["url_match"].append("/$.html");
@@ -340,12 +336,11 @@ namespace Mist {
       }
       
       std::string trackSources;//this string contains all track sources for MBR smil
-      DTSC::Scan tracks = DTSC::Scan(serverCfg.mapped, serverCfg.len).getMember("streams").getMember(streamName).getMember("meta").getMember("tracks");
-      unsigned int track_ctr = tracks.getSize();
-      for (unsigned int i = 0; i < track_ctr; ++i){//for all video tracks
-        DTSC::Scan trk = tracks.getIndice(i);
-        if (trk.getMember("type").asString() == "video"){
-          trackSources += "      <video src='"+ streamName + "?track=" + trk.getMember("trackid").asString() + "' height='" + trk.getMember("height").asString() + "' system-bitrate='" + trk.getMember("bps").asString() + "' width='" + trk.getMember("width").asString() + "' />\n";
+      initialize();
+      if (!myConn){return;}
+      for (std::map<unsigned int, DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
+        if (trit->second.type == "video"){
+          trackSources += "      <video src='"+ streamName + "?track=" + JSON::Value((long long)trit->first).asString() + "' height='" + JSON::Value((long long)trit->second.height).asString() + "' system-bitrate='" + JSON::Value((long long)trit->second.bps).asString() + "' width='" + JSON::Value((long long)trit->second.width).asString() + "' />\n";
         }
       }
       configLock.post();
@@ -388,59 +383,41 @@ namespace Mist {
       if (config->getString("nostreamtext") != ""){
         json_resp["on_error"] = config->getString("nostreamtext");
       }
+      initialize();
+      if (!myConn){
+        return;
+      }
       IPC::semaphore configLock(SEM_CONF, O_CREAT | O_RDWR, ACCESSPERMS, 1);
-      static char liveSemName[NAME_BUFFER_SIZE];
-      snprintf(liveSemName, NAME_BUFFER_SIZE, SEM_LIVE, streamName.c_str());
-      IPC::semaphore metaLocker(liveSemName, O_CREAT | O_RDWR, ACCESSPERMS, 1);
-      bool metaLock = false;
       configLock.wait();
       IPC::sharedPage serverCfg(SHM_CONF, DEFAULT_CONF_PAGE_SIZE);
-      DTSC::Scan strm = DTSC::Scan(serverCfg.mapped, serverCfg.len).getMember("streams").getMember(streamName).getMember("meta");
-      IPC::sharedPage streamIndex;
-      if (!strm){
-        configLock.post();
-        //Stream metadata not found - attempt to start it
-        if (Util::startInput(streamName)){
-          char pageId[NAME_BUFFER_SIZE];
-          snprintf(pageId, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, streamName.c_str());
-          streamIndex.init(pageId, DEFAULT_STRM_PAGE_SIZE);
-          if (streamIndex.mapped){
-            metaLock = true;
-            metaLocker.wait();
-            strm = DTSC::Packet(streamIndex.mapped, streamIndex.len, true).getScan();
-          }
-        }
-        if (!strm){
-          //stream failed to start or isn't configured
-          response += "// Stream isn't configured and/or couldn't be started. Sorry.\n";
-        }
-        configLock.wait();
-      }
       DTSC::Scan prots = DTSC::Scan(serverCfg.mapped, serverCfg.len).getMember("config").getMember("protocols");
-      if (strm && prots){
-        DTSC::Scan trcks = strm.getMember("tracks");
-        unsigned int trcks_ctr = trcks.getSize();
-        for (unsigned int i = 0; i < trcks_ctr; ++i){
-          if (trcks.getIndice(i).getMember("width").asInt() > json_resp["width"].asInt()){
-            json_resp["width"] = trcks.getIndice(i).getMember("width").asInt();
-          }
-          if (trcks.getIndice(i).getMember("height").asInt() > json_resp["height"].asInt()){
-            json_resp["height"] = trcks.getIndice(i).getMember("height").asInt();
+      if (prots){
+        bool hasVideo = false;
+        for (std::map<unsigned int, DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
+          if (trit->second.type == "video"){
+            hasVideo = true;
+            if (trit->second.width > json_resp["width"].asInt()){
+              json_resp["width"] = trit->second.width;
+            }
+            if (trit->second.height > json_resp["height"].asInt()){
+              json_resp["height"] = trit->second.height;
+            }
           }
         }
         if (json_resp["width"].asInt() < 1 || json_resp["height"].asInt() < 1){
           json_resp["width"] = 640ll;
           json_resp["height"] = 480ll;
+          if (!hasVideo){json_resp["height"] = 20ll;}
         }
-        if (strm.getMember("vod")){
+        if (myMeta.vod){
           json_resp["type"] = "vod";
         }
-        if (strm.getMember("live")){
+        if (myMeta.live){
           json_resp["type"] = "live";
         }
         
         // show ALL the meta datas!
-        json_resp["meta"] = strm.asJSON();
+        json_resp["meta"] = myMeta.toJSON();
         jsonForEach(json_resp["meta"]["tracks"], it) {
           if (it->isMember("lang")){
             (*it)["language"] = Encodings::ISO639::decode((*it)["lang"].asStringRef());
@@ -518,10 +495,6 @@ namespace Mist {
       }else{
         json_resp["error"] = "The specified stream is not available on this server.";
       }
-      if (metaLock){
-        metaLocker.post();
-      }
-      
       configLock.post();
       configLock.close();
       if (rURL.substr(0, 6) != "/json_"){
diff --git a/src/output/output_http_internal.h b/src/output/output_http_internal.h
index 5cda9bb3..76191e70 100644
--- a/src/output/output_http_internal.h
+++ b/src/output/output_http_internal.h
@@ -10,7 +10,6 @@ namespace Mist {
       static bool listenMode();
       virtual void onFail();
       void onHTTP();
-      bool isReadyForPlay();
       void sendIcon();
   };
 }