closer, still some buffer mgmt issues