more updates to questions and todos