minor changes to TODO