some 150 corrector cleanup.