Fixed Some TODOs