Remove some XML warnings. Add TODO file.