* fix models and connections