A3: Pre-submission tweaks, fixes