Completed various TODOs.