scanning improvements & log output