Update multi-threading model used by stream, and some gui tweaks