Some todo and description cleanup.