some comments and to-do and 2 more candidates for removal