more hardening to streamer and added features