Completed some TODO's