Scrub buffers when possible

Also provide more commentary