Add correction for unified correction spot. And a bit of refactor.