updated some models
merge