fix model, fix rate activity some issues resolved