Finishes conversion to bufio by making it work