Fixed a couple of the TODOs