FIXED TODO's and some adds