Enhanced some todo notes