Added TODO, fixed a typo