Comment update for buffer option and buffer disabled by default