Some new TODO's and updates