Add stream.js / remove favotter / cosmetic changes