add comments and todos