change some error and finish it