Finished BufferController + minor changes