more fix about the bugs and model