demo + instructions improvements