Completed some items on the TODO.