models bug fixes