DOC: add TODOs based on demo feedback