Fix push/pull, make demo nicer