fixed several models