remove method add method
fix pending client buffers, seems stable (again)