Adding a question and various other changes I never committed