update TODO, self-closing tags