text and markup fixes