Fixed minor bugs and uploading files