tweaks to TODO