minor improvements
fixed stream