fix errors, and add option to supress them if wanted