Question fix for random question showing (how did we miss this again?) and more work to the correct/incorrect submitting