Add a config option for debugging
Fix some incorrect arguments