Correct main loop ... for the first time ever.