updated demo
fixing minore bugs