streaming fixes,e tc