Language and markup polish.
Feedback from dharrigan and bjorn