add todo
incorporate feedback (some as todos)