minor tweeks, added Streams