Additional data file upload support and some comment fixing