Fix minor issues and stuff I didn't mean to commit
Move disk reader to separate file
Add ArchiveMatch
Forgot to add file