Some tweaks to run detection. De-tabbed.