updated models
Misc updates