4/15 done check8. fix some errors