Corrected some config checking and correcting...