Checked off various TODOs.