Modified some of the TODO comments