more questions added to TODO