Fixed a few things and worked on one issue (file validation).