RBuffer fixed 3.
RBuffer fixed 4.
some fixes