updated full content, HTML tidied