vignetting correction, some cleanups