Fixed TODO's