Added TODO, fixed some errors