Make choice questions works, plus varied tweakery and fixery