Signifcant updates to the file extraction script, Scanner, etc.