Many small fixes including stream description