change demo link and various minor changes