fixing models a little and changed some things