Fixed file related bugs, uploading new files

17x28