fixed and validated some models