few bug fixes and updated demo