Clean up excessive run handling, plug in corrected results