Cleaned up some minor todos.
Added a performance note.