adding some to-dos in comments