Fixed an issue in the demo page. Updated to-do list.