Now fix the buffer/cleanup