change some reply and fix bugs