fixed buffer OverF + comments