Fixed inconsistency in table output
Updated TODO