Updated TODO per recent developments.
Output/formatting tweaks.