some subs and stream fixes