demo() improvements