fixing broken stuff
fixed model issue