Added Buffer.
Fixed a few things in Buffer.