Finished off some TODOs