Improved config and debug.