buffering improvements