Updated TODO; fixed all solution warnings