fixed issues and updated demo