Fixed some TODO's and FIXME's