avoid confusing terminology (what is a "word"?), fix scary markup, add section to...