Mostly config and error checking updates and improvements.