Minor changes, new TODO's added