Added skip_last
Added take_last_buffer + cleanup