Added TODO, fixed minor things