Some minor changes, and some trialy with MediaWiKi generation by
txt2tags, for now shifted.