More bug fixes. I'm no longer aware of any bugs in the buffer system - let the testing commence