Added option to disable CHECKs.
More tweaks.