File upload improvements

Further increased upload speed
When uploading files, preserve comments