#6 Fix streams and display of streams.