Precursor to the Nile release

Bug fixes + preliminary implementation of internal streams