fixed the TODO comments