more tweaks to conformance rules in TODO.txt