support for Markable WStreams , fixed other stuff