Fix some wordings and markup