Significant improvement in upload tests and some text formatting.