Update demo & bug fixes