Fix some TODOs. Increments work better now.