Buffering can now be selected from the cmd line