Knocked off a few todos.