Moving to streaming and some other small updates
Merge pull request #3 from jflasher/updates

Moving to streaming and some other small updates