Finished file uploading, small fixes