some models + fix