fixed passing BufferManager()s around everywhere