Some TODOs added/removed