fixing some model issues