Updated buffers

Removed unnecessary buffered streams and changed buffer size.