fixed a few model issues