Fix attribute errors and add notes to todos.