fix so the correct name is in front of a message
removed completed TODOs