DataManager comments and small revision.