new TODOs and minor changes