Finished some TODOs.