Tidied up

Fixed small error in stream.py and commented out several debugging prints.