fix something bugs and review