fixed some bugs from finish