incorporate feedback (some as todos)