Fixed 'ToDo' comments to reflect remaining tasks