fixed a few things and made the models better