changes to bufferpool and heapfile