minor
merge
fixed message stream with katarina, yay