More demo improvements