small improvements in demos