do updates
bug fix

bug fix, do some updates for model, collection