Fix coverage.xhtml, tidy TODO statements