Attended to some TODOs.