streaming read working
clean-up
more cleanup