File Errors Fixed and Cleaned Up