More KNF.
More KNF.
release buffers fix was lost in merge. put it back.