FileUpload Class and some other fixes