improve comprehensive demo

improve comprehensive demo