update TODOs and comments