Fixed uploader and added content type