Misc updates to DirectoryScanner. Additional comments and updated Clone/Reset methods to include new class fields.