get Storm topology into decent shape
merging Russ' streaming changes in