no flip on buffer_handler
fix bad comment
update: