updated TODO, fixed typo in demo comments