Fixed a few TODO:s