final submission format fixes; q4 logic fix