Fixed some TODO's