Documentation/demo improvements