First attempts at solving the buffering bugs, still borched