Improved MOS/TIS conversion speed and minor cleanups