Handled a few todos.