fixed demo and build