Fised problems/ Added more names