same fixes and all models