Commented some TODOs