Add control questions, some formatting improvements