Updating demo with fixes and comments.