Added todo, adjusted messages, count files