Updated a couple TODO's