TODO's and FIXME's update