Tidy up
Update text/HTML versions