Moving to streaming and some other small updates