Some minor comments -- check TODOs