modified much of the models, fixed a few links