Fixed buffering issues it seems.

Now we just need to figure out why