Merge with v2.40D. (Some reformatting was required)
More fixes for silent bugs and self-closing HTML Tags.