More demo improvements.