A few todas updates