Knocking off a few more todos.