Cleanup
More stuff
Add md5 and file_size