Added a todo and fixed some typos.