We pulled a Microsoft.
General touchups and fixes.