buffer_reader tweaks