covered all model, fix some issues