Added todo, fixed demo app