update some comments/TODOs