More improvements to stream info
Add more annotations
Initial attempt to add streamer info to file
Big refactoring to handle object references.
Big refactoring to handle object references.